summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-10-19 20:32:41 +0000
committerDries Buytaert <dries@buytaert.net>2008-10-19 20:32:41 +0000
commitd0bd78238c4a7d88c6f349a48ba6561dcf794907 (patch)
tree99dfcd474cd0a169bbd604579bc86c2bc371e273
parentdc1c2946da78ea041692a2f216909180ce833b65 (diff)
downloadbrdo-d0bd78238c4a7d88c6f349a48ba6561dcf794907.tar.gz
brdo-d0bd78238c4a7d88c6f349a48ba6561dcf794907.tar.bz2
- Rollback of #323182; parse error.
-rw-r--r--includes/theme.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index e55f2732f..5473cb937 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1799,7 +1799,7 @@ function template_preprocess_page(&$variables) {
// Load all region content assigned via blocks.
foreach (array_keys($regions) as $region) {
// Prevent left and right regions from rendering blocks when 'show_blocks' == FALSE.
- if ($variables['show_blocks'] || ($region != 'left' && $region != 'right'))) {
+ if (!(!$variables['show_blocks'] && ($region == 'left' || $region == 'right'))) {
$blocks = theme('blocks', $region);
}
else {