From 16905344219a6293705b71cd526fad3ba07b04eb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 31 Jan 2010 19:02:14 +0100 Subject: first attempt to centralize all include loading Classes are loaded throug PHP5's class autoloader, all other includes are just loaded by default. This skips a lot of require_once calls. Parser and Plugin stuff isn't handled by the class loader yet. --- doku.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 3963a5aa0..990bb43d3 100644 --- a/doku.php +++ b/doku.php @@ -20,13 +20,8 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ $ACT = 'show'; } +// load and initialize the core system require_once(DOKU_INC.'inc/init.php'); -require_once(DOKU_INC.'inc/common.php'); -require_once(DOKU_INC.'inc/events.php'); -require_once(DOKU_INC.'inc/pageutils.php'); -require_once(DOKU_INC.'inc/html.php'); -require_once(DOKU_INC.'inc/auth.php'); -require_once(DOKU_INC.'inc/actions.php'); //import variables $QUERY = trim($_REQUEST['id']); -- cgit v1.2.3 From 40868f2faa85215dfea2fa0c82274a4806d042ab Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Mon, 8 Feb 2010 12:50:20 +0100 Subject: Hide secedit buttons without title --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 3963a5aa0..5f2d2c582 100644 --- a/doku.php +++ b/doku.php @@ -35,7 +35,7 @@ $NS = getNS($ID); $REV = $_REQUEST['rev']; $IDX = $_REQUEST['idx']; $DATE = $_REQUEST['date']; -$RANGE = $_REQUEST['lines']; +$RANGE = $_REQUEST['range']; $HIGH = $_REQUEST['s']; if(empty($HIGH)) $HIGH = getGoogleQuery(); -- cgit v1.2.3 From 45a9933524f9a31e0a104cccfd082217501017ba Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Tue, 9 Mar 2010 11:42:34 +0100 Subject: Move data preprocessing out of html_edit --- doku.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 5f2d2c582..95d5c3101 100644 --- a/doku.php +++ b/doku.php @@ -39,7 +39,9 @@ $RANGE = $_REQUEST['range']; $HIGH = $_REQUEST['s']; if(empty($HIGH)) $HIGH = getGoogleQuery(); -$TEXT = cleanText($_POST['wikitext']); +if (isset($_POST['wikitext'])) { + $TEXT = cleanText($_POST['wikitext']); +} $PRE = cleanText($_POST['prefix']); $SUF = cleanText($_POST['suffix']); $SUM = $_REQUEST['summary']; -- cgit v1.2.3 From d059be8cf238dc11f453f013f0d175d16ddb8a12 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 7 Jun 2010 19:36:48 +0200 Subject: fix index without JavaScript FS#1953 --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 54b1d00e9..52e8e6b8e 100644 --- a/doku.php +++ b/doku.php @@ -12,7 +12,7 @@ if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO'])); -} elseif (!empty($IDX)) { +} elseif (!empty($_REQUEST['idx'])) { $ACT = 'index'; } elseif (isset($_REQUEST['do'])) { $ACT = $_REQUEST['do']; -- cgit v1.2.3 From e2cf96715e4b23d94ad97f3a22e0ce8bb89ed928 Mon Sep 17 00:00:00 2001 From: Gina Haeussge Date: Sun, 27 Jun 2010 12:50:33 +0200 Subject: FS#1960: Don't use substr on $ACT array. --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 52e8e6b8e..052e18be9 100644 --- a/doku.php +++ b/doku.php @@ -61,7 +61,7 @@ if($conf['allowdebug'] && $ACT == 'debug'){ //send 404 for missing pages if configured or ID has special meaning to bots if(!$INFO['exists'] && ($conf['send404'] || preg_match('/^(robots\.txt|sitemap\.xml(\.gz)?|favicon\.ico|crossdomain\.xml)$/',$ID)) && - ($ACT == 'show' || substr($ACT,0,7) == 'export_') ){ + ($ACT == 'show' || (!is_array($ACT) && substr($ACT,0,7) == 'export_')) ){ header('HTTP/1.0 404 Not Found'); } -- cgit v1.2.3 From ef362bb863eb95d3968a3a1df35562914a1bbdef Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 27 Jun 2010 13:58:07 +0100 Subject: moved update message from its own file (conf/msg) into doku.php (FS#1800) --- doku.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 052e18be9..ddee8c902 100644 --- a/doku.php +++ b/doku.php @@ -6,6 +6,9 @@ * @author Andreas Gohr */ +// update message version +$updateVersion = 25; + // xdebug_start_profiling(); if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/'); -- cgit v1.2.3 From 2d80806237992142db35857e6190709d86fa531d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 29 Aug 2010 13:48:18 +0200 Subject: release preparations --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index ddee8c902..3f930a965 100644 --- a/doku.php +++ b/doku.php @@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 25; +$updateVersion = 26; // xdebug_start_profiling(); -- cgit v1.2.3