From c786a1b6200b051466db67a1791f46bbd375bb3b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 18 Nov 2012 12:02:20 +0000
Subject: [PATCH] fixed wrong sidebar showing in namespaces when sidebar is
disabled
---
inc/pageutils.php | 1 +
inc/template.php | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inc/pageutils.php b/inc/pageutils.php
index 3bb10883f..ef82eebcd 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -645,6 +645,7 @@ function utf8_decodeFN($file){
* @return string|false the full page id of the found page, false if any
*/
function page_findnearest($page){
+ if (!$page) return false;
global $ID;
$ns = $ID;
diff --git a/inc/template.php b/inc/template.php
index 0d96be214..4af35cc2b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1471,11 +1471,10 @@ function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap =
* template
*/
function tpl_include_page($pageid, $print = true, $propagate = false) {
- global $ID;
- global $TOC;
-
+ if (!$pageid) return false;
if ($propagate) $pageid = page_findnearest($pageid);
+ global $TOC;
$oldtoc = $TOC;
$html = p_wiki_xhtml($pageid, '', false);
$TOC = $oldtoc;
--
GitLab