* Fix deleting categories when having privileges but not being

      administrator (Patch #1205347, many thanks to Penny Leach)

diff --git a/docs/NEWS b/docs/NEWS
index 09b9f17adcb789a71067757309f4afd3cc4a5f47..b00b69aa9c531369ce6e0a311b0f72dd383cab06 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,18 +3,9 @@
 Version 0.9 ()
 ------------------------------------------------------------------------
 
-    * Increased level of output message from the Spartacus plugin
-      (garvinhicking)
-
-    * Patched XML-RPC functions, thanks to Tim Putnam. This should enable
-      XML-RPC services to properly fetch existing articles and edit them.
-
     * Localized the string "Reply" which occured inside some templates.
       (s/Reply/{$CONST.REPLY}/) (garvinhicking)
 
-    * Patch/Bug #1209410 by swiesinger: When using shortcut admin URL,
-      use https:// when specified by user
-
     * Added swedish translation by Torbjörn Hedberg, Added european 
       portugues translation by Joao Palhoto Matos, Added hungarian
       translation by Posz Marton
@@ -78,6 +69,18 @@ Version 0.9 ()
 Version 0.8.2 ()
 ------------------------------------------------------------------------
 
+    * Patch/Bug #1209410 by swiesinger: When using shortcut admin URL,
+      use https:// when specified by user
+
+    * Fix deleting categories when having privileges but not being
+      administrator (Patch #1205347, many thanks to Penny Leach)
+
+    * Increased level of output message from the Spartacus plugin
+      (garvinhicking)
+
+    * Patched XML-RPC functions, thanks to Tim Putnam. This should enable
+      XML-RPC services to properly fetch existing articles and edit them.
+
     * Fix Plugin API call performing too many unneeded SQL queries
       (garvinhicking)
 

diff --git a/include/admin/category.inc.php b/include/admin/category.inc.php
index 5b926250cdb3264837dc7027820c1d1fd4bcfed9..d55a884835e077dd6a5842d90992eb3081d703ab 100644 (file)
--- a/include/admin/category.inc.php
+++ b/include/admin/category.inc.php
@@ -107,6 +107,7 @@ if ($serendipity['GET']['adminAction'] == 'doDelete') {
 
 <?php
     if ( $serendipity['GET']['adminAction'] == 'delete' ) {
+        $this_cat = serendipity_fetchCategoryInfo($serendipity['GET']['cid']);
         if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF || $serendipity['authorid'] == $this_cat['authorid'] || $this_cat['authorid'] == '0') {
 ?>
         <form method="POST" name="serendipityCategory" action="?serendipity[adminModule]=category&amp;serendipity[adminAction]=doDelete&amp;serendipity[cid]=<?php echo $serendipity['GET']['cid'] ?>">