Missing checks for Zenpage news and/or pages being enabled on themes'…

… search.php
TechnoCompAcademyPuneIndia · Nov 17, 2014 · 7ccc314 · 7ccc314
1 parent 352b31d
commit 7ccc314
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/themes/effervescence_plus/search.php b/themes/effervescence_plus/search.php
@@ -144,7 +144,7 @@ function toggleExtraElements(category, show) {
 						?>
 						<div id="efsearch">
 							<?php
-							if ($numpages > 0) {
+							if ($numpages > 0 && ZP_PAGES_ENABLED) {
 								?>
 								<div id="efsearchhead_pages">
 									<h3><?php printf(gettext('Pages (%s)'), $numpages); ?></h3>
@@ -175,7 +175,7 @@ function toggleExtraElements(category, show) {
 								</div>
 								<?php
 							}
-							if ($numnews > 0) {
+							if ($numnews > 0 && ZP_NEWS_ENABLED) {
 								if ($numpages > 0)
 									echo '<br />';
 								?>

diff --git a/themes/garland/search.php b/themes/garland/search.php
@@ -104,7 +104,7 @@ function toggleExtraElements(category, show) {
 										?>
 										<div id="garland_search">
 											<?php
-											if ($numpages > 0) {
+											if ($numpages > 0 && ZP_PAGES_ENABLED) {
 												?>
 												<div id="garland_searchhead_pages">
 													<h3><?php printf(gettext('Pages (%s)'), $numpages); ?></h3>
@@ -135,7 +135,7 @@ function toggleExtraElements(category, show) {
 												</div>
 												<?php
 											}
-											if ($numnews > 0) {
+											if ($numnews > 0 && ZP_NEWS_ENABLED) {
 												if ($numpages > 0)
 													echo '<br />';
 												?>

diff --git a/themes/zenpage/search.php b/themes/zenpage/search.php
@@ -77,8 +77,8 @@
 						</h3>
 						<?php
 					}
-					if ($_zp_page == 1) { //test of zenpage searches
-						if ($numpages > 0) {
+					if ($zenpage && $_zp_page == 1) { //test of zenpage searches
+						if ($numpages > 0 && ZP_PAGES_ENABLED) {
 							$number_to_show = 5;
 							$c = 0;
 							?>
@@ -99,7 +99,7 @@
 							</ul>
 							<?php
 						}
-						if ($numnews > 0) {
+						if ($numnews > 0 && ZP_NEWS_ENABLED) {
 							$number_to_show = 5;
 							$c = 0;
 							?>

diff --git a/themes/zpmobile/search.php b/themes/zpmobile/search.php
@@ -71,8 +71,8 @@
 						</h3>
 						<?php
 					}
-					if ($_zp_page == 1) { //test of zenpage searches
-						if ($numpages > 0) {
+					if ($zenpage && $_zp_page == 1) { //test of zenpage searches
+						if ($numpages > 0 && ZP_PAGES_ENABLED) {
 							$number_to_show = 5;
 							$c = 0;
 							?>
@@ -93,7 +93,7 @@
 							</ul>
 							<?php
 						}
-						if ($numnews > 0) {
+						if ($numnews > 0 && ZP_NEWS_ENABLED) {
 							$number_to_show = 5;
 							$c = 0;
 							?>