From 0b5a81c6afeca4e7b09a63d62da5e84ad0ff66bd Mon Sep 17 00:00:00 2001
From: shammash <shammash@autistici.org>
Date: Mon, 10 Oct 2011 21:44:20 +0200
Subject: [PATCH] update simply-exclude to 1.7.9.2
---
wp-content/plugins/simply-exclude/readme.txt | 24 ++++-
.../plugins/simply-exclude/simplyexclude.php | 94 ++++++++++---------
2 files changed, 71 insertions(+), 47 deletions(-)
diff --git a/wp-content/plugins/simply-exclude/readme.txt b/wp-content/plugins/simply-exclude/readme.txt
index 157e310c0..bca80b989 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: 3.1
-Stable tag: 1.7.9
+Tested up to: 3.2
+Stable tag: 1.7.9.2
== Description ==
@@ -49,10 +49,28 @@ At the time (version 1.6.1) the plugin only effects Pages included in the tradit
== Changelog ==
+= 1.7.9.2 =
+
+Very small correction to table row elements which were not properly closed. This seemed to effect FireFox 5.0.1
+Thanks for Frank for reporting this issue:
+http://www.codehooligans.com/projects/wordpress/simply-exclude/#comment-107073
+
+= 1.7.9.1 =
+More fixes for compatibility issues with WordPress 3.1. Some of these issues reported are:
+
+* Simply Exclude effects the nav menus with using WP menus. http://wordpress.org/support/topic/plugin-simply-exclude-this-plugin-make-all-my-menus-totally-blank
+
+* Simple Exclude effect filtering of sidebar widgets OR Filter of sidebar content not effected by Simply Exclude settings.
+http://www.codehooligans.com/projects/wordpress/simply-exclude/#comment-82318
+
+I'm sure there are some other areas still having issues. I'm still working on the code changes but wanted to get these fixes posts some at least some users can start using the plugin again.
+
+Thanks to all for reporting issues and thank you for your patience in this code matter.
+
+
= 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 62c29bdf7..32a8e4063 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.9
+Version: 1.7.9.2
Author URI: http://www.codehooligans.com
*/
@@ -359,8 +359,7 @@ class SimplyExclude
function se_install()
{
add_option($this->options_key,
- serialize($this->se_cfg),
- "This is the serialized config structures used.");
+ serialize($this->se_cfg));
}
function se_manage_page()
@@ -633,14 +632,14 @@ class SimplyExclude
&& ($this->se_cfg['cats']['actions'][$action_key] == 'e'))
echo "checked='checked'"; ?> /> Exclude
</td>
- <tr>
+ </tr>
<?php
}
$class = ('alternate' == $class) ? '' : 'alternate';
if (!isset($this->se_cfg['cats']['extra']['wp_list_categories']))
- $this->se_cfg['cats']['extra']['wp_list_categories'] == 'No';
+ $this->se_cfg['cats']['extra']['wp_list_categories'] = 'No';
?>
<tr <?php if (strlen($class)) echo "class='".$class."'" ?>>
<td class="action">Widget</td>
@@ -655,7 +654,7 @@ class SimplyExclude
&& ($this->se_cfg['cats']['extra']['wp_list_categories'] == 'No'))
echo "checked='checked'"; ?> /> No
</td>
- <tr>
+ </tr>
</tbody>
</table>
<br />
@@ -687,7 +686,6 @@ class SimplyExclude
</tr>
</tbody>
</table>
- </p></div>
</form>
<?php
}
@@ -813,7 +811,7 @@ class SimplyExclude
<?php if ($this->se_cfg['tags']['actions'][$action_key] == 'e')
echo "checked='checked'"; ?> /> Exclude
</td>
- <tr>
+ </tr>
<?php
}
$class = ('alternate' == $class) ? '' : 'alternate';
@@ -834,7 +832,7 @@ class SimplyExclude
&& ($this->se_cfg['tags']['extra']['wp_tag_cloud'] == 'No'))
echo "checked='checked'"; ?> /> No
</td>
- <tr>
+ </tr>
</tbody>
</table>
@@ -865,7 +863,6 @@ class SimplyExclude
</tr>
</tbody>
</table>
- </p></div>
</form>
<?php
}
@@ -980,7 +977,7 @@ class SimplyExclude
<?php if ($this->se_cfg['authors']['actions'][$action_key] == 'e')
echo "checked='checked'"; ?> /> Exclude
</td>
- <tr>
+ </tr>
<?php
}
?>
@@ -1013,7 +1010,6 @@ class SimplyExclude
</tr>
</tbody>
</table>
- </p></div>
</form>
<?php
}
@@ -1151,7 +1147,7 @@ class SimplyExclude
&& ($this->se_cfg['pages']['actions'][$action_key] == 'e'))
echo "checked='checked'"; ?> /> Exclude
</td>
- <tr>
+ </tr>
<?php
}
?>
@@ -1185,8 +1181,7 @@ class SimplyExclude
</td>
</tr>
</tbody>
- </table>
-
+ </table>
</form>
<?php
//$this->se_check_google_sitemap_exclude(1);
@@ -1261,7 +1256,7 @@ class SimplyExclude
$action_key = "is_search";
if ((!empty($wp_query->query_vars['s']))
- && (count($this->se_cfg['pages'][$action_key]) > 0))
+ && ((isset($this->se_cfg['pages'][$action_key])) && (count($this->se_cfg['pages'][$action_key]) > 0)))
{
//echo __FUNCTION__ ." before : where=[".$where."]<br />";
$excl_list = $this->get_pages_list(',', $this->se_cfg['pages'][$action_key]);
@@ -1286,11 +1281,15 @@ class SimplyExclude
//echo __FUNCTION__ ." before: where=[".$where."]<br />";
$where = str_replace('"', "'", $where);
- if ('true' == $this->options['SE4_approved_pages_only']) {
- $where = str_replace("post_type = 'post' AND ", "post_password = '' AND ", $where);
- }
- else { // < v 2.1
- $where = str_replace("post_type = 'post' AND ", "", $where);
+
+ if (isset($this->options['SE4_approved_pages_only']))
+ {
+ if ('true' == $this->options['SE4_approved_pages_only']) {
+ $where = str_replace("post_type = 'post' AND ", "post_password = '' AND ", $where);
+ }
+ else { // < v 2.1
+ $where = str_replace("post_type = 'post' AND ", "", $where);
+ }
}
//echo __FUNCTION__ ." after: where=[".$where."]<br />";
}
@@ -1416,7 +1415,7 @@ class SimplyExclude
?>
</td>
- <tr>
+ </tr>
<?php
}
?>
@@ -1430,8 +1429,7 @@ class SimplyExclude
</tr>
</tbody>
- </table>
-
+ </table>
</form>
<?php
}
@@ -1447,16 +1445,19 @@ class SimplyExclude
if (($wp_query->is_admin) || ($wp_query->is_single) || ($wp_query->is_page))
return $wp_query;
+ if ((isset($wp_query->query_vars['post_type']))
+ && (strlen($wp_query->query_vars['post_type'])) )
+ {
+ return $wp_query;
+ }
+
// Only filter on our actions.
-// if ((!is_front_page())
-// && (!is_search())
-// && (!is_archive())
-// && (!is_feed())
-// && (!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 ((!$wp_query->is_home)
+ && (!$wp_query->is_search)
+ && (!$wp_query->is_archive)
+ && (!$wp_query->is_feed)
+ && (!$wp_query->is_author) )
+ return $wp_query;
if (count($this->default_IsActions['cats']) > 0)
{
@@ -1480,6 +1481,7 @@ class SimplyExclude
{
if (count($this->default_IsActions['tags']) > 0)
{
+ //echo "this->default_IsActions[tags]<pre>"; print_r($this->default_IsActions['tags']); echo "</pre>";
foreach ($this->default_IsActions['tags'] as $action_key => $action_val)
{
if ($wp_query->{$action_key})
@@ -1996,19 +1998,23 @@ class SimplyExclude
if (!$all_cat_ids)
$all_cat_ids = array();
- if (($this->se_cfg['cats']['actions']['is_archive'] == 'e')
- && (count($this->se_cfg['cats']['is_archive'])))
+ if ((isset($this->se_cfg['cats']['actions']['is_archive']))
+ && (isset($this->se_cfg['cats']['is_archive'])))
{
- $all_cat_ids = array_keys($this->se_cfg['cats']['is_archive']);
- }
- else if (($this->se_cfg['cats']['actions']['is_archive'] == 'i')
- && (count($this->se_cfg['cats']['is_archive'])))
- {
- foreach($this->se_cfg['cats']['is_archive'] as $c_idx => $c_item)
+ if (($this->se_cfg['cats']['actions']['is_archive'] == 'e')
+ && (count($this->se_cfg['cats']['is_archive'])))
{
- $item_idx = array_search($c_idx, $all_cat_ids);
- if ($item_idx !== false)
- unset($all_cat_ids[$item_idx]);
+ $all_cat_ids = array_keys($this->se_cfg['cats']['is_archive']);
+ }
+ else if (($this->se_cfg['cats']['actions']['is_archive'] == 'i')
+ && (count($this->se_cfg['cats']['is_archive'])))
+ {
+ foreach($this->se_cfg['cats']['is_archive'] as $c_idx => $c_item)
+ {
+ $item_idx = array_search($c_idx, $all_cat_ids);
+ if ($item_idx !== false)
+ unset($all_cat_ids[$item_idx]);
+ }
}
}
--
GitLab