From 08b86b102bb467142e32e535b529fe2f2dcb91c2 Mon Sep 17 00:00:00 2001 From: Ian Date: Mon, 4 Aug 2014 15:01:43 +0200 Subject: [PATCH 1/5] fix plugins no updates' message check References #200 there is more. --- templates/2k11/admin/plugins.inc.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/2k11/admin/plugins.inc.tpl b/templates/2k11/admin/plugins.inc.tpl index 5661ced0..66d2ddc1 100644 --- a/templates/2k11/admin/plugins.inc.tpl +++ b/templates/2k11/admin/plugins.inc.tpl @@ -75,7 +75,7 @@ {foreach $pluggroups AS $pluggroup => $groupstack} {if empty($pluggroup)} - {if $only_group == UPGRADE} {$CONST.NO_UPDATES}{/if} + {if $only_group == UPGRADE && empty($groupstack)} {$CONST.NO_UPDATES}{/if} {if !empty($only_group)}{continue}{/if} {elseif !empty($only_group) && $pluggroup != $only_group}{continue}{else}

{foreach $groupnames as $available_group => $available_name}{if $pluggroup == $available_group}{$available_name}{/if}{/foreach}

From 43ceac124a5f22a9e34ab55a05f164a9dfd950dc Mon Sep 17 00:00:00 2001 From: Ian Date: Tue, 5 Aug 2014 09:45:00 +0200 Subject: [PATCH 2/5] fix subtome path --- .../serendipity_plugin_syndication.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php b/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php index bfaf0af5..4473b2e5 100644 --- a/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php +++ b/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php @@ -9,7 +9,7 @@ class serendipity_plugin_syndication extends serendipity_plugin { $propbag->add('description', SHOWS_RSS_BLAHBLAH); $propbag->add('stackable', true); $propbag->add('author', 'Serendipity Team'); - $propbag->add('version', '2.0'); + $propbag->add('version', '2.1'); $propbag->add('configuration', array( 'title', 'big_img', @@ -30,6 +30,8 @@ class serendipity_plugin_syndication extends serendipity_plugin { function introspect_config_item($name, &$propbag) { + global $serendipity; + switch($name) { case 'title': $propbag->add('type', 'string'); @@ -80,7 +82,7 @@ class serendipity_plugin_syndication extends serendipity_plugin { $propbag->add('type', 'string'); $propbag->add('name', SYNDICATION_PLUGIN_FEEDICON); $propbag->add('description', SYNDICATION_PLUGIN_FEEDICON_DESC); - $propbag->add('default', 'templates/2k11/img/subtome.png'); + $propbag->add('default', $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png'); break; case 'feed_name': @@ -126,7 +128,7 @@ class serendipity_plugin_syndication extends serendipity_plugin { $small_icon = serendipity_getTemplateFile($this->get_config('iconURL', 'img/xml.gif')); $custom_feed = trim($this->get_config('feed_name')); $custom_comm = trim($this->get_config('comment_name')); - $custom_img = trim($this->get_config('big_img', 'templates/2k11/img/subtome.png')); + $custom_img = trim($this->get_config('big_img', $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png')); $subtome = serendipity_db_bool($this->get_config('subToMe', true)); $fbid = $this->get_config('fb_id'); $custom_url = serendipity_db_bool($this->get_config('custom_url', false)); @@ -149,7 +151,7 @@ class serendipity_plugin_syndication extends serendipity_plugin { $icon = "http://feeds.feedburner.com/~fc/$fbid?bg=99CCFF&fg=444444&anim=0"; } if ($fbid == "" && $custom_img == 'feedburner') { - $icon = 'templates/2k11/img/subtome.png'; + $icon = $serendipity['serendipityHTTPPath'] . 'templates/2k11/img/subtome.png'; } } From 9ab56b16061e8604b8d9462cab37c3ae87164b04 Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 7 Aug 2014 11:48:50 +0200 Subject: [PATCH 3/5] fix missing space --- templates/2k11/admin/category.inc.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl index 43b945ff..feba73a1 100644 --- a/templates/2k11/admin/category.inc.tpl +++ b/templates/2k11/admin/category.inc.tpl @@ -115,7 +115,7 @@
- {foreach $groups as $group} From eb5ac2dac1877181b1957cdd8832b99d154fc23d Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 7 Aug 2014 14:20:59 +0200 Subject: [PATCH 4/5] move 'backend_category_showform hook' --- include/admin/category.inc.php | 2 +- templates/2k11/admin/category.inc.tpl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php index 50be28fe..4947e12a 100644 --- a/include/admin/category.inc.php +++ b/include/admin/category.inc.php @@ -181,7 +181,7 @@ if ( $serendipity['GET']['adminAction'] == 'edit' || $serendipity['GET']['adminA $categories = serendipity_fetchCategories('all'); $categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED); $data['categories'] = $categories; - serendipity_plugin_api::hook_event('backend_category_showForm', $cid, $this_cat); + // hook 'backend_category_showForm' moved to category.inc.tpl, to place inside the form } diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl index feba73a1..5cc1081d 100644 --- a/templates/2k11/admin/category.inc.tpl +++ b/templates/2k11/admin/category.inc.tpl @@ -143,6 +143,8 @@
+ {serendipity_hookPlugin hook="backend_category_showForm" data=$cid hookAll="true"} + {$CONST.BACK} From e7ff92136a5c9437078fd754061ffa48744bc3fc Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 7 Aug 2014 15:45:32 +0200 Subject: [PATCH 5/5] fix eb5ac2d to keep eventData array in the flow --- include/admin/category.inc.php | 6 +++++- templates/2k11/admin/category.inc.tpl | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php index 4947e12a..ce17eca0 100644 --- a/include/admin/category.inc.php +++ b/include/admin/category.inc.php @@ -181,7 +181,11 @@ if ( $serendipity['GET']['adminAction'] == 'edit' || $serendipity['GET']['adminA $categories = serendipity_fetchCategories('all'); $categories = serendipity_walkRecursive($categories, 'categoryid', 'parentid', VIEWMODE_THREADED); $data['categories'] = $categories; - // hook 'backend_category_showForm' moved to category.inc.tpl, to place inside the form + // hook content as var to category.inc.tpl, to place inside the form + ob_start(); + serendipity_plugin_api::hook_event('backend_category_showForm', $cid, $this_cat); + $data['category_showForm'] = ob_get_contents(); + ob_end_clean(); } diff --git a/templates/2k11/admin/category.inc.tpl b/templates/2k11/admin/category.inc.tpl index 5cc1081d..a47399a4 100644 --- a/templates/2k11/admin/category.inc.tpl +++ b/templates/2k11/admin/category.inc.tpl @@ -143,7 +143,7 @@ - {serendipity_hookPlugin hook="backend_category_showForm" data=$cid hookAll="true"} + {$category_showForm|default:''} {$CONST.BACK}