FIX:プラグイン管理画面のバグフィックス

テーブル表示用テンプレート定義の条件式が逆になっていたのを修正
テーブルのフッタ部分の変数名の取り違えを修正

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index 4866106..ca52847 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -615,11 +615,11 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN']) )\r
                                {\r
-                                       $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'];\r
+                                       $subTpl = "<a href=\"<%actadminurl%>\" tabindex=\"<%tabindex%>\"><%actadmintxt%></a><br />\n";\r
                                }\r
                                else\r
                                {\r
-                                       $subTpl = "<a href=\"<%actadminurl%>\" tabindex=\"<%tabindex%>\"><%actadmintxt%></a><br />\n";\r
+                                       $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'];\r
                                }\r
                                $subData = array(\r
                                        'actadminurl'   => Entity::hsc($plug->getAdminURL()),\r
@@ -636,11 +636,11 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                        {\r
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP']) )\r
                                {\r
-                                       $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'];\r
+                                       $subTpl = "<a href=\"<%acthelpurl%>\" tabindex=\"<%tabindex%>\"><%acthelptxt%></a><br />\n";\r
                                }\r
                                else\r
                                {\r
-                                       $subTpl = "<a href=\"<%acthelpurl%>\" tabindex=\"<%tabindex%>\"><%acthelptxt%></a><br />\n";\r
+                                       $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'];\r
                                }\r
                                $subData = array(\r
                                        'acthelpurl'    => 'index.php?action=pluginhelp&amp;plugid=' . $current->pid,\r
@@ -686,11 +686,11 @@ function listplug_table_pluginlist($vars, $type, $templateName = '')
                case 'FOOT':\r
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT']) )\r
                        {\r
-                               $subTpl = "";\r
+                               $template = "";\r
                        }\r
                        else\r
                        {\r
-                               $subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'];\r
+                               $template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'];\r
                        }\r
                        $data = array();\r
                        break;\r