diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-12 15:01:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-12 15:01:17 +0200 |
| commit | 3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582 (patch) | |
| tree | 3c9514c745f19dd2874cfd01978e4654aaa084b1 /phpBB | |
| parent | c0d645c319b0bc7c83181d153c026cba052f9306 (diff) | |
| parent | 161be96c661651edad16ccfd946c530626c8aacb (diff) | |
| download | forums-3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582.tar forums-3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582.tar.gz forums-3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582.tar.bz2 forums-3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582.tar.xz forums-3e8d45910dce4f6e6dcdf8103bda8c3ce1b5b582.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
[ticket/9748] Replace <br /> before converting < and > to their entities.
[ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 2 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/search.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index e43881fab2..c419da5574 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'])) ); 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('<br />', "\n", $message); $message = str_replace('<', '<', $message); $message = str_replace('>', '>', $message); - $message = str_replace('<br />', "\n", $message); // make the post UTF-8 $message = phpbb_set_encoding($message); diff --git a/phpBB/search.php b/phpBB/search.php index 96f320fe9f..9e54820c25 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -892,7 +892,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, |