makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug with deleting categories, and found a hard coded english message!

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1472 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
James Atkinson 2001-11-29 08:45:55 +00:00
parent 161996f061
commit db52cc1711
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/admin/admin_forums.php
View file

@ -671,7 +671,7 @@ if( !empty($mode) )
if ($count > 0) if ($count > 0)
{ {
message_die(GENERAL_ERROR, "You need to delete all forums before you can delete this category"); message_die(GENERAL_ERROR, $lang['Must_delete_forums']);
} }
else else
{ {
@ -698,7 +698,8 @@ if( !empty($mode) )
'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'], 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'],
'L_MOVE_CONTENTS' => $lang['Move_contents'], 'L_MOVE_CONTENTS' => $lang['Move_contents'],
'L_FORUM_NAME' => $lang['Forum_name'], 'L_FORUM_NAME' => $lang['Forum_name'],
'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"),
'S_SELECT_TO' => $select_to, 'S_SELECT_TO' => $select_to,
'S_SUBMIT_VALUE' => $buttonvalue) 'S_SUBMIT_VALUE' => $buttonvalue)
@ -739,6 +740,8 @@ if( !empty($mode) )
$sql = "DELETE FROM " . CATEGORIES_TABLE ." $sql = "DELETE FROM " . CATEGORIES_TABLE ."
WHERE cat_id = $from_id"; WHERE cat_id = $from_id";
echo $sql;
if( !$result = $db->sql_query($sql) ) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Couldn't delete category", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Couldn't delete category", "", __LINE__, __FILE__, $sql);

2
phpBB/language/lang_english/lang_admin.php
View file

@ -349,7 +349,7 @@ $lang['Edit_Category_explain'] = "Use this form to modify a categories name.";
$lang['Forums_updated'] = "Forum and Category information updated successfully"; $lang['Forums_updated'] = "Forum and Category information updated successfully";
$lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration";
$lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category";
// //
// Smiley Management // Smiley Management