aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_forums.php
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2001-11-29 08:45:55 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2001-11-29 08:45:55 +0000
commitdb52cc1711af7fc9275d0f86e58a290e28ab5912 (patch)
treeefec0b825400a2ff0cf11fe0b372dd9340edc252 /phpBB/admin/admin_forums.php
parent161996f06191e184c610aad851d606030fd7614c (diff)
downloadforums-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/admin/admin_forums.php')
-rw-r--r--phpBB/admin/admin_forums.php7
1 files changed, 5 insertions, 2 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);