diff options
| author | Michael Hamann <michael@content-space.de> | 2010-11-30 18:34:10 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2010-11-30 18:46:28 +0100 |
| commit | 359fab8b2f7d0847ef0cf9b669e6c8ffb0687525 (patch) | |
| tree | 21294f130e32a797a2c0a5c7a2f4cce0f384ea99 /lib | |
| parent | 38dc5fa6df9a0cd5afd16dc95600d7cf11b08877 (diff) | |
| download | rpg-359fab8b2f7d0847ef0cf9b669e6c8ffb0687525.tar.gz rpg-359fab8b2f7d0847ef0cf9b669e6c8ffb0687525.tar.bz2 | |
Revert "Fix for $conf['breadcrumbs'] < 0, FS#2107", new fix
This reverts commit 4871414204799044c31aa2764c4b4ca020e2331d.
Additionally there is a new fix for FS#2107 that doesn't introduce a lot
of checks but instead ensures that the configuration option can't be set
to negative values when the configuration manager is used.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 2 | ||||
| -rw-r--r-- | lib/tpl/default/main.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 127017624..c2c3a2d0c 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 c1b62f12e..754a6e482 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)?> |