diff options
| author | David Colón <david@davidiq.com> | 2017-09-24 22:07:25 -0400 |
|---|---|---|
| committer | David Colón <david@davidiq.com> | 2017-10-26 16:09:01 -0400 |
| commit | 2ba529e144d2101ea3407d39ecd7e7a043029978 (patch) | |
| tree | 87fd885ed2aa3beeecdf0ad0e3a29311d8687603 | |
| parent | e55480385b5c7d49030d3f380bf2c1349695033b (diff) | |
| download | forums-2ba529e144d2101ea3407d39ecd7e7a043029978.tar forums-2ba529e144d2101ea3407d39ecd7e7a043029978.tar.gz forums-2ba529e144d2101ea3407d39ecd7e7a043029978.tar.bz2 forums-2ba529e144d2101ea3407d39ecd7e7a043029978.tar.xz forums-2ba529e144d2101ea3407d39ecd7e7a043029978.zip | |
[ticket/15372] Fix pagination and don't render viewtopic link
| -rw-r--r-- | phpBB/phpbb/pagination.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewforum_body.html | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/phpbb/pagination.php b/phpBB/phpbb/pagination.php index a5a95b096d..40af5eda6b 100644 --- a/phpBB/phpbb/pagination.php +++ b/phpBB/phpbb/pagination.php @@ -136,6 +136,11 @@ class pagination */ public function generate_template_pagination($base_url, $block_var_name, $start_name, $num_items, $per_page, $start = 1, $reverse_count = false, $ignore_on_page = false) { + if (empty($base_url)) + { + return; + } + $total_pages = ceil($num_items / $per_page); $on_page = $this->get_on_page($per_page, $start); $u_previous_page = $u_next_page = ''; diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 16d972056d..e03ef412e4 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -165,7 +165,7 @@ <i class="icon fa-file fa-fw icon-red icon-md" aria-hidden="true"></i><span class="sr-only">{NEW_POST}</span> </a> <!-- ENDIF --> - <a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a> + <!-- IF topicrow.U_VIEW_TOPIC --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><!-- ELSE -->{topicrow.TOPIC_TITLE}<!-- ENDIF --> <!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED --> <a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}"> <i class="icon fa-question fa-fw icon-blue" aria-hidden="true"></i><span class="sr-only">{L_TOPIC_UNAPPROVED}</span> @@ -224,7 +224,7 @@ <dd class="views">{topicrow.VIEWS} <dfn>{L_VIEWS}</dfn></dd> <dd class="lastpost"> <span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} - <!-- IF not S_IS_BOT --> + <!-- IF not S_IS_BOT and topicrow.U_LAST_POST --> <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}"> <i class="icon fa-external-link-square fa-fw icon-lightgray icon-md" aria-hidden="true"></i><span class="sr-only">{VIEW_LATEST_POST}</span> </a> |