The duplicate sidebar nav entries still were not fixed properly.

This commit is contained in:
Matthias Mees 2014-06-08 22:01:17 +02:00
parent 492eafc140
commit 6e321f5a4d
4 changed files with 16 additions and 7 deletions

View file

@ -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':

View file

@ -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;

View file

@ -1,4 +1,4 @@
<?php
// Actual version of both plugins
@define('PLUGIN_TWITTER_VERSION', '1.63');
@define('PLUGIN_TWITTER_VERSION', '1.64');

View file

@ -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;