opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

more cleanup 

darcs-hash:20050429205436-9977f-762f3ded6f93cfb3e068f3acdc1bb80690ad658b.gz
This commit is contained in:
andi 2005-04-29 22:54:36 +02:00
parent 6c7843b5ad
commit 2a27e99ac0
6 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/dokuwiki.php
View File

@ -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

4
doku.php
View File

@ -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);
?>

2
feed.php
View File

@ -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){

21
inc/parser/handler.php
View File

@ -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);

1
inc/parser/xhtml.php
View File

@ -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';

2
lang/en/admin_acl.txt
View File

@ -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.