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/includes | |
| 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/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 2 |
1 files changed, 1 insertions, 1 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'])) ); |