[php-blog-cvs] serendipity serendipity_admin_category.inc.php,1.12,1.13 NEWS,1.126,1.127

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2926

Modified Files:
	serendipity_admin_category.inc.php NEWS 
Log Message:
Fixed bug #940239 - Wrong message printed when deleting a category without any entries


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- NEWS	19 May 2004 09:27:31 -0000	1.126
+++ NEWS	19 May 2004 21:03:46 -0000	1.127
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed bug #940239 - Wrong message printed when deleting a category
+      without any entries (tomsommer)
+
     * Bugfix for serendipity_plugin_remoterss: Wrong caching.
       (Richard Thomas Harrison)
 

Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_admin_category.inc.php	4 May 2004 09:02:30 -0000	1.12
+++ serendipity_admin_category.inc.php	19 May 2004 21:03:46 -0000	1.13
@@ -32,10 +32,10 @@
         $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid'];
         $del = serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE categoryid=$cat_to_edit $admin_category");
         if ($del[0] > 0) {
-            serendipity_db_query("UPDATE      {$serendipity['dbPrefix']}entries  SET categoryid=$remaining_cat WHERE categoryid=$cat_to_edit");
-            $msg = sprintf(CATEGORY_DELETED, $cat_to_edit, $remaining_cat);
+            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries  SET categoryid=$remaining_cat WHERE categoryid=$cat_to_edit");
+            $msg = sprintf(CATEGORY_DELETED_ARTICLES_MOVED, $cat_to_edit, $remaining_cat);
         } else {
-            $msg = INVALID_CATEGORY;
+            $msg = sprintf(CATEGORY_DELETED,  $cat_to_edit);
         }
     } else {
         $msg = INVALID_CATEGORY;