diff options
| -rw-r--r-- | conf/dokuwiki.php | 2 | ||||
| -rw-r--r-- | doku.php | 4 | ||||
| -rw-r--r-- | feed.php | 2 | ||||
| -rw-r--r-- | inc/parser/handler.php | 21 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 1 | ||||
| -rw-r--r-- | lang/en/admin_acl.txt | 2 |
6 files changed, 25 insertions, 7 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index d22dbe94b..591a14eb4 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -53,7 +53,7 @@ $conf['useacl'] = 0; //Use Access Control Lists to restrict $conf['openregister']= 1; //Should users to be allowed to register? $conf['authtype'] = 'plain'; //which authentication DB should be used (currently plain only) $conf['defaultgroup']= 'user'; //Default groups new Users are added to -$conf['superuser'] = 'superman'; //The admin can be user or @group +$conf['superuser'] = '!!not set!!'; //The admin can be user or @group /* Advanced Options */ $conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal @@ -6,7 +6,7 @@ * @author Andreas Gohr <andi@splitbrain.org> */ - //xdebug_start_profiling(); +// xdebug_start_profiling(); if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/'); require_once(DOKU_INC.'inc/init.php'); @@ -61,5 +61,5 @@ //restore old umask umask($conf['oldumask']); - //xdebug_dump_function_profile(3); +// xdebug_dump_function_profile(1); ?> @@ -83,7 +83,7 @@ function rssRecentChanges(&$rss,$num,$ltype){ $item = new FeedItem(); $item->title = $id; if(!empty($recents[$id]['sum'])){ - $item->title .= ': '.strip_tags($recents[$id]['sum']); + $item->title .= ' - '.strip_tags($recents[$id]['sum']); } switch ($ltype){ diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 1d7af1864..91d884345 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1147,7 +1147,11 @@ class Doku_Handler_Section { } -//------------------------------------------------------------------------ +/** + * Handler for paragraphs + * + * @author Harry Fuecks <harryf@gmail.com> + */ class Doku_Handler_Block { var $calls = array(); @@ -1186,6 +1190,13 @@ class Doku_Handler_Block { 'footnote_close','section_close', ); + /** + * Close a paragraph if needed + * + * This function makes sure there are no empty paragraphs on the stack + * + * @author Andreas Gohr <andi@splitbrain.org> + */ function closeParagraph($pos){ // look back if there was any content - we don't want empty paragraphs $content = ''; @@ -1208,6 +1219,13 @@ class Doku_Handler_Block { } } + /** + * Processes the whole instruction stack to open and close paragraphs + * + * @author Harry Fuecks <harryf@gmail.com> + * @author Andreas Gohr <andi@splitbrain.org> + * @todo This thing is really messy and should be rewritten + */ function process($calls) { foreach ( $calls as $key => $call ) { @@ -1371,6 +1389,7 @@ class Doku_Handler_Block { $this->inParagraph = $state[1]; } } + //------------------------------------------------------------------------ define('DOKU_TOC_OPEN',1); define('DOKU_TOCBRANCH_OPEN',2); diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 63f79d17c..9df02c942 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -436,7 +436,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $name = $this->_getLinkTitle($name, $this->_simpleTitle($id), $isImage, $id); resolve_pageid(getNS($ID),$id,$exists); - if ( !$isImage ) { if ( $exists ) { $class='wikilink1'; diff --git a/lang/en/admin_acl.txt b/lang/en/admin_acl.txt index 0ced5f626..ff5442e24 100644 --- a/lang/en/admin_acl.txt +++ b/lang/en/admin_acl.txt @@ -6,7 +6,7 @@ You should read the [[doku>wiki:acl|official documentation on ACL]] to fully understand how access control works. The page displays all permissions that are significant for the -current page. Permissions regarding other pages ar not shown -- to +current page. Permissions regarding other pages are not shown -- to edit them [[this>doku.php?do=index|browse]] to the according page first, then change to the ACL Administration. |