diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-29 08:45:55 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2001-11-29 08:45:55 +0000 |
| commit | db52cc1711af7fc9275d0f86e58a290e28ab5912 (patch) | |
| tree | efec0b825400a2ff0cf11fe0b372dd9340edc252 /phpBB | |
| parent | 161996f06191e184c610aad851d606030fd7614c (diff) | |
| download | forums-db52cc1711af7fc9275d0f86e58a290e28ab5912.tar forums-db52cc1711af7fc9275d0f86e58a290e28ab5912.tar.gz forums-db52cc1711af7fc9275d0f86e58a290e28ab5912.tar.bz2 forums-db52cc1711af7fc9275d0f86e58a290e28ab5912.tar.xz forums-db52cc1711af7fc9275d0f86e58a290e28ab5912.zip | |
Fixed bug with deleting categories, and found a hard coded english message!
git-svn-id: file:///svn/phpbb/trunk@1472 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/admin/admin_forums.php | 7 | ||||
| -rw-r--r-- | phpBB/language/lang_english/lang_admin.php | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php index f8132f2685..3c7a4c9087 100644 --- a/phpBB/admin/admin_forums.php +++ b/phpBB/admin/admin_forums.php @@ -671,7 +671,7 @@ if( !empty($mode) ) 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 { @@ -698,7 +698,8 @@ if( !empty($mode) ) 'L_FORUM_DELETE_EXPLAIN' => $lang['Forum_delete_explain'], 'L_MOVE_CONTENTS' => $lang['Move_contents'], 'L_FORUM_NAME' => $lang['Forum_name'], - + + 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 'S_SELECT_TO' => $select_to, 'S_SUBMIT_VALUE' => $buttonvalue) @@ -739,6 +740,8 @@ if( !empty($mode) ) $sql = "DELETE FROM " . CATEGORIES_TABLE ." WHERE cat_id = $from_id"; + + echo $sql; if( !$result = $db->sql_query($sql) ) { message_die(GENERAL_ERROR, "Couldn't delete category", "", __LINE__, __FILE__, $sql); diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index a14da05bf8..a716423ae1 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -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['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 |