From 2f67eafd347134aa05483f44d969128211431b1b Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 23 Jul 2010 19:50:17 +0200 Subject: [PATCH 1/3] [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'. Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503 --- phpBB/includes/mcp/mcp_queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index f84a8c5f07..179623a8ed 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -428,7 +428,7 @@ class mcp_queue 'POST_ID' => $row['post_id'], 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], - 'POST_SUBJECT' => $row['post_subject'], + 'POST_SUBJECT' => ($row['post_subject'] != '') ? $row['post_subject'] : $user->lang['NO_SUBJECT'], 'TOPIC_TITLE' => $row['topic_title'], 'POST_TIME' => $user->format_date($row['post_time'])) ); From 66fc086742d052cada3e582f6a08ca48bd0b0714 Mon Sep 17 00:00:00 2001 From: Richard Foote Date: Sat, 24 Jul 2010 11:47:36 +0200 Subject: [PATCH 2/3] [ticket/9748] Replace
before converting < and > to their entities. PHPBB3-9748 --- phpBB/install/convertors/functions_phpbb20.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index b80c7673e3..78224dd5da 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1239,9 +1239,9 @@ function phpbb_prepare_message($message) // Already the new user id ;) $user_id = $convert->row['poster_id']; + $message = str_replace('
', "\n", $message); $message = str_replace('<', '<', $message); $message = str_replace('>', '>', $message); - $message = str_replace('
', "\n", $message); // make the post UTF-8 $message = phpbb_set_encoding($message); From 843d6e53fb7fe234878b5022dae133fb32b84a86 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 26 Jul 2010 23:57:22 +0200 Subject: [PATCH 3/3] [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php PHPBB3-9754 --- phpBB/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 1e1e42d01f..ab6339eef7 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -891,7 +891,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'S_TOPIC_GLOBAL' => (!$forum_id) ? true : false, 'S_TOPIC_TYPE' => $row['topic_type'], - 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, + 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false, 'S_UNREAD_TOPIC' => $unread_topic, 'S_TOPIC_REPORTED' => (!empty($row['topic_reported']) && $auth->acl_get('m_report', $forum_id)) ? true : false,