diff --git a/doku.php b/doku.php index ccab843eea0b95c6dac0344f034c6faedb2146fb..1303f1ade47ef9f5465c3cb47b1c772e867eaa37 100644 --- a/doku.php +++ b/doku.php @@ -69,7 +69,7 @@ if(!$INFO['exists'] && } //prepare breadcrumbs (initialize a static var) -if ($conf['breadcrumbs'] > 0) breadcrumbs(); +if ($conf['breadcrumbs']) breadcrumbs(); // check upstream checkUpdateMessages(); diff --git a/inc/common.php b/inc/common.php index b6048825b10a46713abe8e2516e9658ca4c955d3..a1c4580a6a6a3f5460fb19c757a3b4ae21a29d0f 100644 --- a/inc/common.php +++ b/inc/common.php @@ -268,9 +268,6 @@ 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 d171ab075a836c1444b6636406968182283f5272..53ae9abced8981aebf1da2299454b0bbfc9011b4 100644 --- a/inc/template.php +++ b/inc/template.php @@ -690,7 +690,7 @@ function tpl_breadcrumbs($sep='»'){ global $conf; //check if enabled - if(!is_numeric($conf['breadcrumbs']) || $conf['breadcrumbs'] <= 0) return false; + if(!$conf['breadcrumbs']) return false; $crumbs = breadcrumbs(); //setup crumb trace diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 127017624728b288fa846851750b28a6e5c7ccf9..c2c3a2d0c1cba4c36c05b5320c726a2352c90dec 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -101,7 +101,7 @@ $meta['allowdebug'] = array('onoff'); $meta['_display'] = array('fieldset'); $meta['recent'] = array('numeric'); -$meta['breadcrumbs'] = array('numeric'); +$meta['breadcrumbs'] = array('numeric','_min' => 0); $meta['youarehere'] = array('onoff'); $meta['fullpath'] = array('onoff'); $meta['typography'] = array('multichoice','_choices' => array(0,1,2)); diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index c1b62f12e834c7a1ef4572aaed3ef7644e11ade8..754a6e48233e352388c8067d4918d8677ebeb543 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -68,7 +68,7 @@ if (!defined('DOKU_INC')) die(); <div class="clearer"></div> </div> - <?php if($conf['breadcrumbs'] > 0){?> + <?php if($conf['breadcrumbs']){?> <div class="breadcrumbs"> <?php tpl_breadcrumbs()?> <?php //tpl_youarehere() //(some people prefer this)?>