aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-09-24 10:34:08 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-09-24 10:34:08 +0200
commit9717d860da76f8a22b87cf67684c0bf6f10d223d (patch)
treebdbbf104d634b76c7cb68db65ac6b102a57b33ef
parenta437c8fdfd396014cf479d08f1099e060184e4fe (diff)
parent43279ee0103c7d26e1755ccdd353d6af2f38491b (diff)
downloadforums-9717d860da76f8a22b87cf67684c0bf6f10d223d.tar
forums-9717d860da76f8a22b87cf67684c0bf6f10d223d.tar.gz
forums-9717d860da76f8a22b87cf67684c0bf6f10d223d.tar.bz2
forums-9717d860da76f8a22b87cf67684c0bf6f10d223d.tar.xz
forums-9717d860da76f8a22b87cf67684c0bf6f10d223d.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpBB/styles/prosilver/template/search_results.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index b31e7b7b5d..970a7bcdd1 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -11,10 +11,10 @@
<p><a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">{L_GO_TO_SEARCH_ADV}</a></p>
<!-- ENDIF -->
-<!-- IF .pagination or SEARCH_MATCHES or PAGE_NUMBER -->
+<!-- IF .pagination or SEARCH_MATCHES or TOTAL_MATCHES or PAGE_NUMBER -->
<div class="action-bar top">
- <!-- IF SEARCH_MATCHES -->
+ <!-- IF TOTAL_MATCHES > 0 -->
<div class="search-box">
<form method="post" action="{S_SEARCH_ACTION}">
<fieldset>
@@ -178,9 +178,9 @@
<div class="action-bar bottom">
<div class="pagination">
{SEARCH_MATCHES}
- <!-- IF .pagination -->
+ <!-- IF .pagination -->
<!-- INCLUDE pagination.html -->
- <!-- ELSE -->
+ <!-- ELSE -->
&bull; {PAGE_NUMBER}
<!-- ENDIF -->
</div>