diff --git a/wp-content/plugins/simply-exclude/readme.txt b/wp-content/plugins/simply-exclude/readme.txt index a6599a65caf87c39b3b5a236369e0bde8297fc48..157e310c06f40b52171717271c1f252e276412c9 100644 --- a/wp-content/plugins/simply-exclude/readme.txt +++ b/wp-content/plugins/simply-exclude/readme.txt @@ -3,8 +3,8 @@ Contributors: Paul Menard Donate link: http://www.codehooligans.com/donations/ Tags: admin, posts, pages, categories, tags, exclude, include, is_front, is_archive, is_search, is_feed Requires at least: 2.8 -Tested up to: 2.9.2 -Stable tag: 1.7.8 +Tested up to: 3.1 +Stable tag: 1.7.9 == Description == @@ -49,6 +49,10 @@ At the time (version 1.6.1) the plugin only effects Pages included in the tradit == Changelog == += 1.7.9 = +Fixes some small issue which prevented this plugin from working under WordPress 3.1. + + = 1.7.8 = Fixes: Mainly bug fixes and code cleanup. Patched code based on reported issues with the WP Gallery shortcode and the new WP 3.0 RC1 menus Additions: Added some logic to Categories and Tags to work with Exclude/Include when using the WordPress Category or Tag Cloud Widgets. diff --git a/wp-content/plugins/simply-exclude/simplyexclude.php b/wp-content/plugins/simply-exclude/simplyexclude.php index c025214ac38ff6f8d99dc11f08da56e9ab965c27..62c29bdf7b861d1f7ec61033a4fd2f5c155148e0 100644 --- a/wp-content/plugins/simply-exclude/simplyexclude.php +++ b/wp-content/plugins/simply-exclude/simplyexclude.php @@ -4,7 +4,7 @@ Plugin Name: Simply Exclude Plugin URI: http://www.codehooligans.com/projects/wordpress/simply-exclude/ Description: Provides an interface to selectively exclude/include categories, tags and page from the 4 actions used by WordPress. is_front, is_archive, is_search, is_feed, is_front. Author: Paul Menard -Version: 1.7.8 +Version: 1.7.9 Author URI: http://www.codehooligans.com */ @@ -231,6 +231,7 @@ class SimplyExclude else $this->se_cfg = $tmp_se_cfg; } +// echo "se_cfg<pre>"; print_r($this->se_cfg); echo "</pre>"; $plugindir_node = dirname(plugin_basename(__FILE__)); $plugindir_url = get_bloginfo('wpurl') . "/wp-content/plugins/". $plugindir_node; @@ -1441,12 +1442,10 @@ class SimplyExclude - function se_filters() + function se_filters($wp_query) { - global $wp_query; - - if ((is_admin()) || (is_single()) || (is_page())) - return; + if (($wp_query->is_admin) || ($wp_query->is_single) || ($wp_query->is_page)) + return $wp_query; // Only filter on our actions. // if ((!is_front_page()) @@ -1456,25 +1455,22 @@ class SimplyExclude // && (!is_author()) ) // return; + //echo "se_cfg<pre>"; print_r($this->se_cfg); echo "</pre>"; +// echo "default_IsActions<pre>"; print_r($this->default_IsActions); echo "</pre>"; + if (count($this->default_IsActions['cats']) > 0) { - //echo "cats<pre>"; print_r($this->default_IsActions['cats']); echo "</pre>"; foreach ($this->default_IsActions['cats'] as $action_key => $action_val) { $cats_list = ""; if ($wp_query->{$action_key}) { - if (isset($this->se_cfg['cats'][$action_key])) + if ((isset($this->se_cfg['cats'][$action_key])) && (count($this->se_cfg['cats'][$action_key]))) { - if (count($this->se_cfg['cats'][$action_key])) - { - $cats_list = $this->se_listify_ids( $this->se_cfg['cats']['actions'][$action_key], - $this->se_cfg['cats'][$action_key]); - } - } - if (strlen($cats_list)) - { - $wp_query->set('cat', $cats_list); + if ($this->se_cfg['cats']['actions'][$action_key] == 'e') + $wp_query->set('category__not_in', array_keys($this->se_cfg['cats'][$action_key])); + else + $wp_query->set('category__in', array_keys($this->se_cfg['cats'][$action_key])); } } } @@ -1488,28 +1484,12 @@ class SimplyExclude { if ($wp_query->{$action_key}) { - if (isset($this->se_cfg['tags'][$action_key])) + if ((isset($this->se_cfg['tags'][$action_key])) && (count($this->se_cfg['tags'][$action_key]) > 0)) { - if (isset($tag_array_list)) - unset($tag_array_list); - - $tag_array_list = array(); - if (count($this->se_cfg['tags'][$action_key]) > 0) - { - foreach($this->se_cfg['tags'][$action_key] as $key => $val) - { - $tag_array_list[] = $key; - } - - if ($this->se_cfg['tags']['actions'][$action_key] == "e") - { - $wp_query->set('tag__not_in', $tag_array_list); - } - else - { - $wp_query->set('tag__in', $tag_array_list); - } - } + if ($this->se_cfg['tags']['actions'][$action_key] == "e") + $wp_query->set('tag__not_in', array_keys($this->se_cfg['tags'][$action_key])); + else + $wp_query->set('tag__in', array_keys($this->se_cfg['tags'][$action_key])); } } } @@ -1549,6 +1529,7 @@ class SimplyExclude } } } + return $wp_query; } function se_listify_ids($action, $ids)