summaryrefslogtreecommitdiff
path: root/inc/common.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2010-11-26 16:54:51 +0100
committerMichael Hamann <michael@content-space.de>2010-11-26 17:02:33 +0100
commit4871414204799044c31aa2764c4b4ca020e2331d (patch)
tree45f1da8ce8c6a99678a395c576e0f0d6cb9ded11 /inc/common.php
parentd1d99bb9528b5a7ca62b74e60314288602cbd5a0 (diff)
downloadrpg-4871414204799044c31aa2764c4b4ca020e2331d.tar.gz
rpg-4871414204799044c31aa2764c4b4ca020e2331d.tar.bz2
Fix for $conf['breadcrumbs'] < 0, FS#2107
This fixes an infinite loop in breadcrumbs() and makes the behaviors in all places where breadcrumbs are used consistent so that non-numeric values, values < 0 and 0 are treated the same way.
Diffstat (limited to 'inc/common.php')
-rw-r--r--inc/common.php3
1 files changed, 3 insertions, 0 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