From 6e321f5a4d121ede2241b37f53ff28cc9db36835 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Sun, 8 Jun 2014 22:01:17 +0200
Subject: [PATCH] The duplicate sidebar nav entries still were not fixed
 properly.

---
 .../serendipity_event_adminnotes.php                     | 5 ++++-
 .../serendipity_event_spamblock_bayes.php                | 9 ++++++---
 serendipity_plugin_twitter/plugin_version.inc.php        | 2 +-
 serendipity_plugin_twitter/serendipity_event_twitter.php | 7 +++++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/serendipity_event_adminnotes/serendipity_event_adminnotes.php b/serendipity_event_adminnotes/serendipity_event_adminnotes.php
index 523111bb..962e8a01 100644
--- a/serendipity_event_adminnotes/serendipity_event_adminnotes.php
+++ b/serendipity_event_adminnotes/serendipity_event_adminnotes.php
@@ -27,7 +27,7 @@ class serendipity_event_adminnotes extends serendipity_event {
             'php'         => '4.1.0'
         ));
 
-        $propbag->add('version',       '0.10');
+        $propbag->add('version',       '0.11');
         $propbag->add('author',        'Garvin Hicking, Matthias Mees');
         $propbag->add('stackable',     false);
         $propbag->add('configuration', array('feedback', 'limit', 'html', 'markup', 'cutoff'));
@@ -441,9 +441,12 @@ class serendipity_event_adminnotes extends serendipity_event {
                     break;
 
                 case 'backend_sidebar_admin':
+                    if ($serendipity['version'][0] == '1') {
+                    } else {
 ?>
                         <li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=adminnotes"><?php echo PLUGIN_ADMINNOTES_TITLE; ?></a></li>
 <?php
+                    }
                     break;
 
                 case 'backend_sidebar_entries_event_display_adminnotes':
diff --git a/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php b/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
index aa56363a..bde95686 100644
--- a/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
+++ b/serendipity_event_spamblock_bayes/serendipity_event_spamblock_bayes.php
@@ -42,7 +42,7 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
 		$this->title = PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME;
 		$propbag->add ( 'description', PLUGIN_EVENT_SPAMBLOCK_BAYES_DESC);
 		$propbag->add ( 'name', $this->title);
-		$propbag->add ( 'version', '0.4.12' );
+		$propbag->add ( 'version', '0.4.13' );
 		$propbag->add ( 'event_hooks', array ('frontend_saveComment' => true,
 		                                     'backend_spamblock_comments_shown' => true,
 		                                     'external_plugin' => true,
@@ -1277,8 +1277,11 @@ class serendipity_event_spamblock_bayes extends serendipity_event {
                     if (!serendipity_checkPermission('adminComments')) {
                         break;
                     }
-                    if ($this->get_config('menu', true)) {
-                        echo '<li><a href="?serendipity[adminModule]=event_display&serendipity[adminAction]=spamblock_bayes&serendipity[subpage]=1">' . PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME . '</a></li>';
+                    if ($serendipity['version'][0] == '1') {
+                    } else {
+                        if ($this->get_config('menu', true)) {
+                            echo '<li><a href="?serendipity[adminModule]=event_display&serendipity[adminAction]=spamblock_bayes&serendipity[subpage]=1">' . PLUGIN_EVENT_SPAMBLOCK_BAYES_NAME . '</a></li>';
+                        }
                     }
                     return true;
                     break;
diff --git a/serendipity_plugin_twitter/plugin_version.inc.php b/serendipity_plugin_twitter/plugin_version.inc.php
index 8aed5d70..bc5563ed 100644
--- a/serendipity_plugin_twitter/plugin_version.inc.php
+++ b/serendipity_plugin_twitter/plugin_version.inc.php
@@ -1,4 +1,4 @@
 <?php
 
 // Actual version of both plugins
-@define('PLUGIN_TWITTER_VERSION', '1.63');
+@define('PLUGIN_TWITTER_VERSION', '1.64');
diff --git a/serendipity_plugin_twitter/serendipity_event_twitter.php b/serendipity_plugin_twitter/serendipity_event_twitter.php
index bdf7f961..28fce7ea 100644
--- a/serendipity_plugin_twitter/serendipity_event_twitter.php
+++ b/serendipity_plugin_twitter/serendipity_event_twitter.php
@@ -1016,10 +1016,13 @@ class serendipity_event_twitter extends serendipity_plugin {
                     return true;
 
                 case 'backend_sidebar_admin_appearance':
-                    if ($this->get_config('tweeter_show', 'disable') == 'sidebar') {
+                    if ($serendipity['version'][0] == '1') {
+                    } else {
+                        if ($this->get_config('tweeter_show', 'disable') == 'sidebar') {
 ?>
-                    <li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=tweeter"><?php echo PLUGIN_EVENT_TWITTER_TWEETER_SIDEBARTITLE; ?></a></li>
+                            <li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=tweeter"><?php echo PLUGIN_EVENT_TWITTER_TWEETER_SIDEBARTITLE; ?></a></li>
 <?php
+                        }
                     }
                     return true;