diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-10-17 15:01:56 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-10-17 15:01:56 +0000 |
| commit | d095649a655ce7dfeae124b2946dadc5248eafc4 (patch) | |
| tree | 9d3fa941adfb8c6759d009d4d8be9f75ddb8f30e | |
| parent | fe66d104a6d89ccfc2185ccd078d9b14842e0d32 (diff) | |
| download | forums-d095649a655ce7dfeae124b2946dadc5248eafc4.tar forums-d095649a655ce7dfeae124b2946dadc5248eafc4.tar.gz forums-d095649a655ce7dfeae124b2946dadc5248eafc4.tar.bz2 forums-d095649a655ce7dfeae124b2946dadc5248eafc4.tar.xz forums-d095649a655ce7dfeae124b2946dadc5248eafc4.zip | |
- Display "Return to" links on unwritable forums [Bug #14824]
git-svn-id: file:///svn/phpbb/trunk@8200 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/jumpbox.html | 4 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 1 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4d47a6be41..d403b7bd28 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -78,10 +78,11 @@ <div class="content"> - <a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC7</h3> + <a name="v30rc7"></a><h3>1.i. Changes since 3.0.RC7</h3> <ul> <li>[Fix] Fixed MSSQL related bug in the update system</li> + <li>[Fix] Display "Return to" links on unwritable forums (Bug #14824)</li> </ul> <a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3> diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 323668628d..cf98701c78 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -2,9 +2,9 @@ <!-- IF S_DISPLAY_JUMPBOX --> <form method="post" id="jumpbox" action="{S_JUMPBOX_ACTION}" onsubmit="if(document.jumpbox.f.value == -1){return false;}"> - <!-- IF U_POST_REPLY_TOPIC --> + <!-- IF S_VIEWTOPIC --> <p><a href="{U_VIEW_FORUM}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {FORUM_NAME}</a></p> - <!-- ELSEIF U_POST_NEW_TOPIC --> + <!-- ELSEIF S_VIEWFORUM --> <p><a href="{U_INDEX}" class="left-box {S_CONTENT_FLOW_BEGIN}" accesskey="r">{L_RETURN_TO} {L_INDEX}</a></p> <!-- ELSEIF SEARCH_TOPIC --> <p><a class="left-box {S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">{L_RETURN_TO}: {SEARCH_TOPIC}</a></p> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 46a5ccf5e7..c7888505cd 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -627,6 +627,7 @@ if (sizeof($topic_list)) 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, + 'S_VIEWFORUM' => true, 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9d2a6b61c0..32b35a2060 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1425,6 +1425,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'S_FIRST_UNREAD' => $s_first_unread, 'S_CUSTOM_FIELDS' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, 'S_TOPIC_POSTER' => ($topic_data['topic_poster'] == $poster_id) ? true : false, + 'S_VIEWTOPIC' => true, 'S_IGNORE_POST' => ($row['hide_post']) ? true : false, 'L_IGNORE_POST' => ($row['hide_post']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '<a href="' . $viewtopic_url . "&p={$row['post_id']}&view=show#p{$row['post_id']}" . '">', '</a>') : '', |