From ca6ad31ff8297f467fb51c21e10d404c9a8d8f66 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Thu, 28 Nov 2002 00:39:37 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3132 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/admin/admin_styles.php | 6 +++--- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/privmsg.php | 12 ++++++------ phpBB/update_to_204.php | 16 ++++++++++------ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php index 4986b86ec0..a7d636b6b8 100644 --- a/phpBB/admin/admin_styles.php +++ b/phpBB/admin/admin_styles.php @@ -43,7 +43,7 @@ $phpbb_root_path = "./../"; $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : FALSE; $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : FALSE; -if( empty($HTTP_POST_VARS['send_file']) ) +if (empty($HTTP_POST_VARS['send_file'])) { $no_page_header = ( $cancel ) ? TRUE : FALSE; require($phpbb_root_path . 'extension.inc'); @@ -932,9 +932,9 @@ switch( $mode ) break; } -if( !$HTTP_POST_VARS['send_file'] ) +if (empty($HTTP_POST_VARS['send_file'])) { include('./page_footer_admin.'.$phpEx); } -?> +?> \ No newline at end of file diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6a43aca6e8..10e5fbc809 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -113,6 +113,8 @@ h3 {font-size:12pt;color:blue}
  • Grammatical errors in English lang_main fixed - Cluster
  • Allow deletion of avatar and simultaneous upload/linking/gallery selection
  • Fixed non-updating of user rank when changing from special to normal rank in rank admin
    • +
  • Changed user topic notification default in schemas to 0 (off)
    • +
  • Fixed non-XHTML compliant img tags in privmsg.php
  • diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index e6d0388a53..2e06c0408a 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -351,14 +351,14 @@ else if ( $mode == 'read' ) 'edit' => append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") ); $post_icons = array( - 'post_img' => '' . $lang['Post_new_pm'] . '', + 'post_img' => '' . $lang['Post_new_pm'] . '', 'post' => '' . $lang['Post_new_pm'] . '', - 'reply_img' => '' . $lang['Post_reply_pm'] . '', + 'reply_img' => '' . $lang['Post_reply_pm'] . '', 'reply' => '' . $lang['Post_reply_pm'] . '', - 'quote_img' => '' . $lang['Post_quote_pm'] . '', + 'quote_img' => '' . $lang['Post_quote_pm'] . '', 'quote' => '' . $lang['Post_quote_pm'] . '', - 'edit_img' => '' . $lang['Edit_pm'] . '', - 'edit' => '' . $lang['Edit_pm'] . '' + 'edit_img' => '' . $lang['Edit_pm'] . '', + 'edit' => '' . $lang['Edit_pm'] . '' ); if ( $folder == 'inbox' ) @@ -1881,7 +1881,7 @@ switch ( $folder ) break; } $post_pm = append_sid("privmsg.$phpEx?mode=post"); -$post_pm_img = '' . $lang['Post_new_pm'] . ''; +$post_pm_img = '' . $lang['Post_new_pm'] . ''; $post_pm = '' . $lang['Post_new_pm'] . ''; // diff --git a/phpBB/update_to_204.php b/phpBB/update_to_204.php index e503b41383..98b1f66b44 100644 --- a/phpBB/update_to_204.php +++ b/phpBB/update_to_204.php @@ -285,8 +285,8 @@ switch ( $row['config_value'] ) --------------------------------------------------------------------- */ $sql[] = "CREATE TABLE Tmp_" . GROUPS_TABLE . " (group_id int IDENTITY (1, 1) NOT NULL, group_type smallint NULL, group_name varchar(50) NOT NULL, group_description varchar(255) NOT NULL, group_moderator int NULL, group_single_user smallint NOT NULL) ON [PRIMARY]"; - $sql[] = "INSERT INTO Tmp_" . GROPUS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) - SELECT group_id, group_type, group_name, group_description, group_moderator, group_signle_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "INSERT INTO Tmp_" . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user) + SELECT group_type, group_name, group_description, group_moderator, group_single_user FROM " . GROUPS_TABLE . " TABLOCKX"; $sql[] = "DROP TABLE " . GROUPS_TABLE; $sql[] = "EXECUTE sp_rename N'Tmp_" . GROUPS_TABLE . "', N'" . GROUPS_TABLE . "', 'OBJECT'"; $sql[] = "ALTER TABLE " . GROUPS_TABLE . " ADD @@ -398,8 +398,10 @@ switch ( $row['config_value'] ) --------------------------------------------------------------------- */ $sql[] = "CREATE TABLE Tmp_" . GROUPS_TABLE . " (group_id int IDENTITY (1, 1) NOT NULL, group_type smallint NULL, group_name varchar(50) NOT NULL, group_description varchar(255) NOT NULL, group_moderator int NULL, group_single_user smallint NOT NULL) ON [PRIMARY]"; - $sql[] = "INSERT INTO Tmp_" . GROPUS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) - SELECT group_id, group_type, group_name, group_description, group_moderator, group_signle_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " ON" + $sql[] = "INSERT INTO Tmp_" . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) + SELECT group_id, group_type, group_name, group_description, group_moderator, group_single_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " OFF" $sql[] = "DROP TABLE " . GROUPS_TABLE; $sql[] = "EXECUTE sp_rename N'Tmp_" . GROUPS_TABLE . "', N'" . GROUPS_TABLE . "', 'OBJECT'"; $sql[] = "ALTER TABLE " . GROUPS_TABLE . " ADD @@ -429,8 +431,10 @@ switch ( $row['config_value'] ) --------------------------------------------------------------------- */ $sql[] = "CREATE TABLE Tmp_" . GROUPS_TABLE . " (group_id int IDENTITY (1, 1) NOT NULL, group_type smallint NULL, group_name varchar(50) NOT NULL, group_description varchar(255) NOT NULL, group_moderator int NULL, group_single_user smallint NOT NULL) ON [PRIMARY]"; - $sql[] = "INSERT INTO Tmp_" . GROPUS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) - SELECT group_id, group_type, group_name, group_description, group_moderator, group_signle_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " ON" + $sql[] = "INSERT INTO Tmp_" . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) + SELECT group_id, group_type, group_name, group_description, group_moderator, group_single_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " OFF" $sql[] = "DROP TABLE " . GROUPS_TABLE; $sql[] = "EXECUTE sp_rename N'Tmp_" . GROUPS_TABLE . "', N'" . GROUPS_TABLE . "', 'OBJECT'"; $sql[] = "ALTER TABLE " . GROUPS_TABLE . " ADD