FIX: There is a case that a category isn't eliminated behind PreDeleteCategory, so...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1046 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/libs/ADMIN.php b/utf8/nucleus/libs/ADMIN.php
index 91b4ca4..b8ef539 100755 (executable)
--- a/utf8/nucleus/libs/ADMIN.php
+++ b/utf8/nucleus/libs/ADMIN.php
@@ -2816,8 +2816,6 @@ class ADMIN {
 \r
         $catid = intval($catid);\r
 \r
-        $manager->notify('PreDeleteCategory', array('catid' => $catid));\r
-\r
         $blogid = getBlogIDFromCatID($catid);\r
 \r
         if (!$member->blogAdminRights($blogid))\r
@@ -2842,6 +2840,8 @@ class ADMIN {
         if (sql_num_rows($res) == 1)\r
             return _ERROR_DELETELASTCATEGORY;\r
 \r
+        $manager->notify('PreDeleteCategory', array('catid' => $catid));\r
+\r
         // change category for all items to the default category\r
         $query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";\r
         sql_query($query);\r
@@ -3326,6 +3326,8 @@ class ADMIN {
 \r
 \r
 \r
+\r
+\r
         $blog->additem($blog->getDefaultCategory(),_EBLOG_FIRSTITEM_TITLE,_EBLOG_FIRSTITEM_BODY,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);\r
 \r
 \r
@@ -6429,6 +6431,8 @@ selector();
             if ($iPrevPid != $aOption['pid']) {\r
                 $iPrevPid = $aOption['pid'];\r
 \r
+\r
+\r
                 echo '<tr><th colspan="2">'.sprintf(_PLUGIN_OPTIONS_TITLE, htmlspecialchars($aOption['pfile']. ENT_QUOTES)).'</th></tr>';\r
             }\r
 \r