summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/common.php3
-rw-r--r--inc/template.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php
index 18f782788..667846804 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -268,6 +268,9 @@ function breadcrumbs(){
global $ACT;
global $conf;
+ // Prevent infinite loop later in this function
+ if (!is_numeric($conf['breadcrumbs']) || $conf['breadcrumbs'] <= 0) return array();
+
//first visit?
$crumbs = isset($_SESSION[DOKU_COOKIE]['bc']) ? $_SESSION[DOKU_COOKIE]['bc'] : array();
//we only save on show and existing wiki documents
diff --git a/inc/template.php b/inc/template.php
index e2ea6e386..b89f7abbc 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -690,7 +690,7 @@ function tpl_breadcrumbs($sep='&raquo;'){
global $conf;
//check if enabled
- if(!$conf['breadcrumbs']) return false;
+ if(!is_numeric($conf['breadcrumbs']) || $conf['breadcrumbs'] <= 0) return false;
$crumbs = breadcrumbs(); //setup crumb trace