mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

* Fix SQL query statement for deleting a category, which on some

Browse Source 
DB types (SQlite) might not return "true" and thus not really
      delete the category. (garvinhicking)
This commit is contained in:
Garvin Hicking 2010-04-27 07:57:04 +00:00
parent 47da2f74ef
commit 510469b664
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -3,6 +3,10 @@
Version 1.6 () Version 1.6 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fix SQL query statement for deleting a category, which on some
DB types (SQlite) might not return "true" and thus not really
delete the category. (garvinhicking)
* Truncate suppressed referrer's query string to 255 characters * Truncate suppressed referrer's query string to 255 characters
(ads) (ads)

20
include/admin/category.inc.php
View File

@ -93,19 +93,19 @@ if ($serendipity['GET']['adminAction'] == 'doDelete' && serendipity_checkFormTok
AND c.category_left BETWEEN {$category_range} AND c.category_left BETWEEN {$category_range}
{$admin_category}"; {$admin_category}";
} }
if ( serendipity_db_query($query) ) {
if (serendipity_deleteCategory($category_range, $admin_category) ) {
foreach($category_ranges AS $cid) { serendipity_db_query($query);
if (serendipity_ACLCheck($serendipity['authorid'], $cid, 'category', 'write')) { if (serendipity_deleteCategory($category_range, $admin_category) ) {
serendipity_ACLGrant($cid, 'category', 'read', array());
serendipity_ACLGrant($cid, 'category', 'write', array()); foreach($category_ranges AS $cid) {
} if (serendipity_ACLCheck($serendipity['authorid'], $cid, 'category', 'write')) {
serendipity_ACLGrant($cid, 'category', 'read', array());
serendipity_ACLGrant($cid, 'category', 'write', array());
} }
echo '<div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . ($remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, (int)$serendipity['GET']['cid'], $remaining_cat) : sprintf(CATEGORY_DELETED,(int)$serendipity['GET']['cid'])) .'</div>';
$serendipity['GET']['adminAction'] = 'view';
} }
echo '<div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . ($remaining_cat ? sprintf(CATEGORY_DELETED_ARTICLES_MOVED, (int)$serendipity['GET']['cid'], $remaining_cat) : sprintf(CATEGORY_DELETED,(int)$serendipity['GET']['cid'])) .'</div>';
$serendipity['GET']['adminAction'] = 'view';
} }
} else { } else {
echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />'. INVALID_CATEGORY .'</div>'; echo '<div class="serendipityAdminMsgError"><img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />'. INVALID_CATEGORY .'</div>';