Merge branch 'skinnable-master' of git.sourceforge.jp:/gitroot/nucleus-jp/nucleus...

diff --git a/nucleus/libs/PLUGIN.php b/nucleus/libs/PLUGIN.php
index caf8241..99586f3 100644 (file)
--- a/nucleus/libs/PLUGIN.php
+++ b/nucleus/libs/PLUGIN.php
@@ -647,7 +647,7 @@ abstract class NucleusPlugin
                        // fill DB with default value\r
                        $this->option_values[$key] = $this->get_default_value($context, $name);\r
                        $query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, '%s');";\r
-                       $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, sql_real_escape_string($defVal));\r
+                       $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, sql_real_escape_string($this->option_values[$key]));\r
                        sql_query($query);\r
                }\r
                else\r

diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 47bd307..6cf9616 100644 (file)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -896,7 +896,7 @@ $manager->notify(
        {\r
                $res = sql_query($query);\r
                $obj = sql_fetch_object($res);\r
-               return $obj->result;\r
+               return (is_object($obj)) ? $obj->result : FALSE;\r
        }\r
 \r
 function getPluginNameFromPid($pid) {\r

diff --git a/skins/admin/defaultadmin/skinbackup.xml b/skins/admin/defaultadmin/skinbackup.xml
index 3c5fe26..20e912f 100644 (file)
--- a/skins/admin/defaultadmin/skinbackup.xml
+++ b/skins/admin/defaultadmin/skinbackup.xml
@@ -1686,7 +1686,7 @@ selector();
                 </div><!-- content -->\r
                 <div id="quickmenu">\r
                     <%if(loggedin)%><%ifnot(adminaction,showlogin)%><ul>\r
-                        <li><a href="index.php?action=overview"><%text(_QMENU_HOME)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=overview"><%text(_QMENU_HOME)%></a></li>\r
                     </ul>\r
 \r
                     <h2><%text(_QMENU_ADD)%></h2>\r
@@ -1699,31 +1699,31 @@ selector();
             \r
                     <h2><%member(yourrealname)%></h2>\r
                     <ul>\r
-                        <li><a href="index.php?action=editmembersettings"><%text(_QMENU_USER_SETTINGS)%></a></li>\r
-                        <li><a href="index.php?action=browseownitems"><%text(_QMENU_USER_ITEMS)%></a></li>\r
-                        <li><a href="index.php?action=browseowncomments"><%text(_QMENU_USER_COMMENTS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=editmembersettings"><%text(_QMENU_USER_SETTINGS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=browseownitems"><%text(_QMENU_USER_ITEMS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=browseowncomments"><%text(_QMENU_USER_COMMENTS)%></a></li>\r
                     </ul>\r
                     <%if(superadmin)%><h2><%text(_QMENU_MANAGE)%></h2>\r
                     <ul>\r
-                        <li><a href="index.php?action=actionlog"><%text(_QMENU_MANAGE_LOG)%></a></li>\r
-                        <li><a href="index.php?action=settingsedit"><%text(_QMENU_MANAGE_SETTINGS)%></a></li>\r
-                        <li><a href="index.php?action=systemoverview"><%text(_QMENU_MANAGE_SYSTEM)%></a></li>\r
-                        <li><a href="index.php?action=usermanagement"><%text(_QMENU_MANAGE_MEMBERS)%></a></li>\r
-                        <li><a href="index.php?action=createnewlog"><%text(_QMENU_MANAGE_NEWBLOG)%></a></li>\r
-                        <li><a href="index.php?action=backupoverview"><%text(_QMENU_MANAGE_BACKUPS)%></a></li>\r
-                        <li><a href="index.php?action=pluginlist"><%text(_QMENU_MANAGE_PLUGINS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=actionlog"><%text(_QMENU_MANAGE_LOG)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=settingsedit"><%text(_QMENU_MANAGE_SETTINGS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=systemoverview"><%text(_QMENU_MANAGE_SYSTEM)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=usermanagement"><%text(_QMENU_MANAGE_MEMBERS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=createnewlog"><%text(_QMENU_MANAGE_NEWBLOG)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=backupoverview"><%text(_QMENU_MANAGE_BACKUPS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=pluginlist"><%text(_QMENU_MANAGE_PLUGINS)%></a></li>\r
                     </ul>\r
                     <h2><%text(_QMENU_LAYOUT)%></h2>\r
                     <ul>\r
-                        <li><a href="index.php?action=skinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
-                        <li><a href="index.php?action=templateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
-                        <li><a href="index.php?action=skinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=skinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=templateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=skinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
                     </ul>\r
                     <h2><%text(_SKINABLEADMIN_QMENU_LAYOUT)%></h2>\r
                     <ul>\r
-                        <li><a href="index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
-                        <li><a href="index.php?action=admintemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
-                        <li><a href="index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=adminskinoverview"><%text(_QMENU_LAYOUT_SKINS)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=admintemplateoverview"><%text(_QMENU_LAYOUT_TEMPL)%></a></li>\r
+                        <li><a href="<%adminurl%>index.php?action=adminskinieoverview"><%text(_QMENU_LAYOUT_IEXPORT)%></a></li>\r
                     </ul><%endif%>\r
                     <%quickmenu(defaultadmin)%>\r
                     <%elseif(adminaction,activate)%><h2><%text(_QMENU_ACTIVATE)%></h2><%text(_QMENU_ACTIVATE_TEXT)%>\r
@@ -1969,7 +1969,7 @@ selector();
             <br />\r
             <%text(_LOGIN_PASSWORD)%> <br /><input name="password"  tabindex="20" type="password" />\r
             <br />\r
-            <input name="action" value="login" type="hidden" /><input name="customaction" value="top" type="hidden" />\r
+            <input name="action" value="login" type="hidden" />\r
             <br />\r
             <input type="submit" value="<%text(_LOGIN)%>" tabindex="30" />\r
             <br />\r