From 4871414204799044c31aa2764c4b4ca020e2331d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 26 Nov 2010 16:54:51 +0100
Subject: 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.
---
 lib/tpl/default/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 754a6e482..c1b62f12e 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']){?>
+    <?php if($conf['breadcrumbs'] > 0){?>
     <div class="breadcrumbs">
       <?php tpl_breadcrumbs()?>
       <?php //tpl_youarehere() //(some people prefer this)?>
-- 
cgit v1.2.3


From 359fab8b2f7d0847ef0cf9b669e6c8ffb0687525 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 30 Nov 2010 18:34:10 +0100
Subject: 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.
---
 lib/tpl/default/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tpl')

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)?>
-- 
cgit v1.2.3


From be96545ccf297b7b2a7bf10b2d0f35d636e8adf6 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 3 Jan 2011 15:46:10 +0000
Subject: removed obsolete references to 'JSnocheck' class

---
 lib/tpl/default/rtl.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index e40dd966d..82c85839b 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -55,8 +55,7 @@ div.dokuwiki li ol {
 div.dokuwiki a.urlextern,
 div.dokuwiki a.interwiki,
 div.dokuwiki a.windows,
-div.dokuwiki a.mail,
-div.dokuwiki a.mail.JSnocheck {
+div.dokuwiki a.mail {
   /* should work but doesn't - so we just disable icons here*/
   /*
   background-position: right 1px;
-- 
cgit v1.2.3