From 7f497764e1f40419f1dcacecc6762bebf588bcbf Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 25 Mar 2006 13:05:28 +0000
Subject: [PATCH] fixed tiny bugs

git-svn-id: file:///svn/phpbb/trunk@5711 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_forums.php            |  4 ++--
 phpBB/install/schemas/mysql_schema.sql       | 14 +++++++-------
 phpBB/language/en/posting.php                |  2 +-
 phpBB/styles/subSilver/imageset/imageset.cfg |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index b59ab50c34..59792b5e01 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -1300,13 +1300,13 @@ class acp_forums
 					POLL_VOTES_TABLE		=> 'pv.topic_id',
 				);
 
-				$sql = 'DELETE ' . POSTS_TABLE . ' p';
+				$sql = 'DELETE ';
 				$sql_using = "\nFROM " . POSTS_TABLE . ' p';
 				$sql_where = "\nWHERE p.forum_id = $forum_id\n";
 
 				foreach ($tables_ary as $table => $field)
 				{
-					$sql .= ", $table " . strtok($field, '.');
+//					$sql .= ", $table " . strtok($field, '.');
 					$sql_using .= ", $table " . strtok($field, '.');
 					$sql_where .= "\nAND $field = p." . strtok('');
 				}
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 54776af947..1468e38ebc 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -4,7 +4,7 @@
 # $Id$
 #
 
-# Table: phpbb_attachments
+# Table: 'phpbb_attachments'
 CREATE TABLE phpbb_attachments (
   attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,
   post_msg_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -29,7 +29,7 @@ CREATE TABLE phpbb_attachments (
   KEY filesize (filesize)
 );
 
-# Table: phpbb_auth_groups
+# Table: 'phpbb_auth_groups'
 CREATE TABLE phpbb_auth_groups (
   group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -40,7 +40,7 @@ CREATE TABLE phpbb_auth_groups (
   KEY auth_option_id (auth_option_id)
 );
 
-# Table: phpbb_auth_options
+# Table: 'phpbb_auth_options'
 CREATE TABLE phpbb_auth_options (
   auth_option_id mediumint(8) UNSIGNED NOT NULL auto_increment,
   auth_option char(20) NOT NULL,
@@ -51,7 +51,7 @@ CREATE TABLE phpbb_auth_options (
   KEY auth_option (auth_option)
 );
 
-# Table: phpbb_auth_roles
+# Table: 'phpbb_auth_roles'
 CREATE TABLE phpbb_auth_roles (
   role_id mediumint(8) UNSIGNED NOT NULL auto_increment,
   role_name varchar(50) DEFAULT '' NOT NULL,
@@ -61,7 +61,7 @@ CREATE TABLE phpbb_auth_roles (
   KEY role_type (role_type)
 );
 
-# Table: phpbb_auth_roles_data
+# Table: 'phpbb_auth_roles_data'
 CREATE TABLE phpbb_auth_roles_data (
   role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -69,7 +69,7 @@ CREATE TABLE phpbb_auth_roles_data (
   PRIMARY KEY  (role_id, auth_option_id)
 );
 
-# Table: phpbb_auth_users
+# Table: 'phpbb_auth_users'
 CREATE TABLE phpbb_auth_users (
   user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -241,7 +241,7 @@ CREATE TABLE phpbb_forums (
    KEY forum_last_post_id (forum_last_post_id)
 );
 
-# Table: phpbb_forum_access
+# Table: 'phpbb_forum_access'
 CREATE TABLE phpbb_forum_access (
   forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
   user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 643c0410af..bd801a7f58 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -148,7 +148,7 @@ $lang = array_merge($lang, array(
 	'POST_NORMAL'				=> 'Normal',
 	'POST_REPLY'				=> 'Post a reply',
 	'POST_REVIEW'				=> 'Post Review',
-	'POST_REVIEW_EXPLAIN'		=> 'At least one new post has been made to this topic. You may wish to review your post inlight of this.',
+	'POST_REVIEW_EXPLAIN'		=> 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
 	'POST_STORED'				=> 'Your message has been posted successfully',
 	'POST_STORED_MOD'			=> 'Your message has been saved but requires approval',
 	'POST_TOPIC'				=> 'Post a new topic',
diff --git a/phpBB/styles/subSilver/imageset/imageset.cfg b/phpBB/styles/subSilver/imageset/imageset.cfg
index 2269a31ed3..350f729f7b 100644
--- a/phpBB/styles/subSilver/imageset/imageset.cfg
+++ b/phpBB/styles/subSilver/imageset/imageset.cfg
@@ -27,7 +27,7 @@ img_btn_post = {LANG}/btn_post.gif*27*97
 img_btn_post_pm = {LANG}/btn_post_pm.gif*27*97
 img_btn_reply = {LANG}/btn_reply.gif*27*97
 img_btn_reply_pm = {LANG}/btn_reply_pm.gif*20*90
-img_img_btn_locked = {LANG}/btn_locked.gif*27*97
+img_btn_locked = {LANG}/btn_locked.gif*27*97
 img_btn_profile = {LANG}/btn_profile.gif*20*72
 img_btn_pm = {LANG}/btn_pm.gif*20*72
 img_btn_delete = {LANG}/btn_delete.gif*20*20