Merge remote-tracking branch 'upstream/master'

php · Mar 22, 2015 · a9be349 · a9be349
2 parents 730a665 + 3defe9d
commit a9be349
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/dokuwiki/conf/local.php b/dokuwiki/conf/local.php
@@ -22,5 +22,7 @@
 $conf['userewrite'] = '1';
 $conf['useslash'] = 1;
 $conf['send404'] = 1;
+$conf['breadcrumbs'] = 0;
+$conf['youarehere'] = 1;
 
 // end auto-generated content
diff --git a/dokuwiki/lib/plugins/phpcvs/plugin.info.txt b/dokuwiki/lib/plugins/phpcvs/plugin.info.txt
@@ -0,0 +1,7 @@
+base   phpcvs
+author Lukas Smith
+email  smith@pooteeweet.org
+date   2013-12-16
+name   PHP CVS
+desc   Auth component
+url    http://git.php.net/?p=web/wiki.git;a=tree;f=dokuwiki/lib/plugins/phpcvs
diff --git a/dokuwiki/lib/tpl/phpnet/main.php b/dokuwiki/lib/tpl/phpnet/main.php
@@ -52,11 +52,7 @@
 
 <section id="breadcrumbs">
 <nav>
-<ol>
-<?php foreach(array_slice(breadcrumbs(), -8) as $breadcrumb => $name): ?>
-    <li><?php tpl_link(wl($breadcrumb), hsc($name), 'class="breadcrumbs" title="'.$id.'"')?></li>
-<?php endforeach ?>
-</ol>
+<?php tpl_youarehere(' › '); ?>
 </nav>
 </section>
 <section class="mainscreen">