Changeset 1329627
- Timestamp:
- 01/16/2016 04:06:25 PM (10 years ago)
- Location:
- chronosly-events-calendar
- Files:
-
- 3 edited
- 13 copied
-
tags/2.3.2 (copied) (copied from chronosly-events-calendar/trunk)
-
tags/2.3.2/README.txt (copied) (copied from chronosly-events-calendar/trunk/README.txt) (1 diff)
-
tags/2.3.2/README.txt~ (copied) (copied from chronosly-events-calendar/trunk/README.txt~) (1 diff)
-
tags/2.3.2/chronosly.php (copied) (copied from chronosly-events-calendar/trunk/chronosly.php)
-
tags/2.3.2/classes/chronosly_dad_elements.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_dad_elements.php)
-
tags/2.3.2/classes/chronosly_extend.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_extend.php)
-
tags/2.3.2/classes/chronosly_shortcode.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_shortcode.php)
-
tags/2.3.2/classes/chronosly_templates.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_templates.php)
-
tags/2.3.2/classes/chronosly_widgets.php (copied) (copied from chronosly-events-calendar/trunk/classes/chronosly_widgets.php)
-
tags/2.3.2/custom-templates/dad2/default.html (copied) (copied from chronosly-events-calendar/trunk/custom-templates/dad2/default.html)
-
tags/2.3.2/custom-templates/dad2/default_featured.html (copied) (copied from chronosly-events-calendar/trunk/custom-templates/dad2/default_featured.html)
-
tags/2.3.2/post-types/post_type_chronosly.php (copied) (copied from chronosly-events-calendar/trunk/post-types/post_type_chronosly.php) (5 diffs)
-
tags/2.3.2/post-types/post_type_chronosly_calendar.php (copied) (copied from chronosly-events-calendar/trunk/post-types/post_type_chronosly_calendar.php)
-
trunk/README.txt (modified) (1 diff)
-
trunk/README.txt~ (modified) (1 diff)
-
trunk/post-types/post_type_chronosly.php (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
chronosly-events-calendar/tags/2.3.2/README.txt
r1329607 r1329627 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 28 Stable tag: 2.3.1 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/tags/2.3.2/README.txt~
r1329607 r1329627 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 28 Stable tag: 2.3.0 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/tags/2.3.2/post-types/post_type_chronosly.php
r1325241 r1329627 195 195 $limit = ((isset($_REQUEST["count"]) and $_REQUEST["count"])?$_REQUEST["count"]:$settings["chronosly_events_x_page"]); 196 196 197 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]and (!isset($_REQUEST["ch_from"]) or !isset($_REQUEST["ch_to"]))) {197 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) and (!isset($_REQUEST["ch_from"]) or !isset($_REQUEST["ch_to"]))) { 198 198 for($i= 0; $i < count($metaquery); ++$i){ 199 199 foreach($metaquery[$i] as $k => $val){ … … 402 402 if($query->get('post_type') != "chronosly" and $query->get('post_type') != "chronosly_category" and !$query->get('chronosly_category') and $query->get('post_type') != "chronosly_tag" and !$query->get('chronosly_tag')) return 0; 403 403 $settings = unserialize(get_option("chronosly-settings")); 404 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]and (!$_REQUEST["ch_from"] or !$_REQUEST["ch_to"])) {404 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) and (!$_REQUEST["ch_from"] or !$_REQUEST["ch_to"])) { 405 405 $meta_query = $query->get('meta_query'); 406 406 $meta_query[] = array("key" => "ev-to", "value" => date("Y-m-d"), 'compare' => '>='); … … 588 588 else { 589 589 $fromc = date("Y-m-d",strtotime("+$time day")); 590 if( $settings["chronosly_show_past_events"]or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day"));590 if((!isset($_REQUEST["ch_show_past"]) and $settings["chronosly_show_past_events"]) or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day")); 591 591 else $toc = date("Y-m-d"); 592 592 // echo $toc; … … 845 845 else { 846 846 $fromc = date("Y-m-d",strtotime("+$time day")); 847 if( $settings["chronosly_show_past_events"]or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day"));847 if((!isset($_REQUEST["ch_show_past"]) and $settings["chronosly_show_past_events"]) or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day")); 848 848 else $toc = date("Y-m-d"); 849 849 } … … 852 852 break; 853 853 } 854 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]) $toc = date("Y-m-d");//en caso que no tengamos que mostrar los pasts854 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) ) $toc = date("Y-m-d");//en caso que no tengamos que mostrar los pasts 855 855 if($_REQUEST["ch_from"] and $_REQUEST["ch_to"]){ 856 856 $fromc = $_REQUEST["ch_to"]; -
chronosly-events-calendar/trunk/README.txt
r1329607 r1329627 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 28 Stable tag: 2.3.1 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/trunk/README.txt~
r1329607 r1329627 6 6 Requires at least: 3.1 7 7 Tested up to: 4.4.1 8 Stable tag: 2.3. 28 Stable tag: 2.3.0 9 9 License: GPLv2 10 10 -
chronosly-events-calendar/trunk/post-types/post_type_chronosly.php
r1325241 r1329627 195 195 $limit = ((isset($_REQUEST["count"]) and $_REQUEST["count"])?$_REQUEST["count"]:$settings["chronosly_events_x_page"]); 196 196 197 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]and (!isset($_REQUEST["ch_from"]) or !isset($_REQUEST["ch_to"]))) {197 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) and (!isset($_REQUEST["ch_from"]) or !isset($_REQUEST["ch_to"]))) { 198 198 for($i= 0; $i < count($metaquery); ++$i){ 199 199 foreach($metaquery[$i] as $k => $val){ … … 402 402 if($query->get('post_type') != "chronosly" and $query->get('post_type') != "chronosly_category" and !$query->get('chronosly_category') and $query->get('post_type') != "chronosly_tag" and !$query->get('chronosly_tag')) return 0; 403 403 $settings = unserialize(get_option("chronosly-settings")); 404 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]and (!$_REQUEST["ch_from"] or !$_REQUEST["ch_to"])) {404 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) and (!$_REQUEST["ch_from"] or !$_REQUEST["ch_to"])) { 405 405 $meta_query = $query->get('meta_query'); 406 406 $meta_query[] = array("key" => "ev-to", "value" => date("Y-m-d"), 'compare' => '>='); … … 588 588 else { 589 589 $fromc = date("Y-m-d",strtotime("+$time day")); 590 if( $settings["chronosly_show_past_events"]or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day"));590 if((!isset($_REQUEST["ch_show_past"]) and $settings["chronosly_show_past_events"]) or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day")); 591 591 else $toc = date("Y-m-d"); 592 592 // echo $toc; … … 845 845 else { 846 846 $fromc = date("Y-m-d",strtotime("+$time day")); 847 if( $settings["chronosly_show_past_events"]or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day"));847 if((!isset($_REQUEST["ch_show_past"]) and $settings["chronosly_show_past_events"]) or $_REQUEST["ch_show_past"]) $toc = date("Y-m-d",strtotime("-$time day")); 848 848 else $toc = date("Y-m-d"); 849 849 } … … 852 852 break; 853 853 } 854 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and !$_REQUEST["ch_show_past"]) $toc = date("Y-m-d");//en caso que no tengamos que mostrar los pasts854 if((!isset($settings["chronosly_show_past_events"]) or !$settings["chronosly_show_past_events"]) and (!isset($_REQUEST["ch_show_past"]) or !$_REQUEST["ch_show_past"]) ) $toc = date("Y-m-d");//en caso que no tengamos que mostrar los pasts 855 855 if($_REQUEST["ch_from"] and $_REQUEST["ch_to"]){ 856 856 $fromc = $_REQUEST["ch_to"];
Note: See TracChangeset
for help on using the changeset viewer.