From baef77a2b52933a6dd7caf3f641ff5ce6e6164f3 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 27 Oct 2010 20:37:31 +0200 Subject: preparations for another release candidate --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 733d0a118..517cdeb2e 100644 --- a/doku.php +++ b/doku.php @@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 27; +$updateVersion = 28; // xdebug_start_profiling(); -- cgit v1.2.3 From eb97dcb864e05302756dcec4320c3c41866e4217 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 7 Nov 2010 17:37:54 +0100 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 517cdeb2e..1303f1ade 100644 --- a/doku.php +++ b/doku.php @@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 28; +$updateVersion = 29; // xdebug_start_profiling(); -- cgit v1.2.3 From 4871414204799044c31aa2764c4b4ca020e2331d Mon Sep 17 00:00:00 2001 From: Michael Hamann 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. --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 1303f1ade..ccab843ee 100644 --- a/doku.php +++ b/doku.php @@ -69,7 +69,7 @@ if(!$INFO['exists'] && } //prepare breadcrumbs (initialize a static var) -if ($conf['breadcrumbs']) breadcrumbs(); +if ($conf['breadcrumbs'] > 0) breadcrumbs(); // check upstream checkUpdateMessages(); -- cgit v1.2.3 From 359fab8b2f7d0847ef0cf9b669e6c8ffb0687525 Mon Sep 17 00:00:00 2001 From: Michael Hamann 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. --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index ccab843ee..1303f1ade 100644 --- a/doku.php +++ b/doku.php @@ -69,7 +69,7 @@ if(!$INFO['exists'] && } //prepare breadcrumbs (initialize a static var) -if ($conf['breadcrumbs'] > 0) breadcrumbs(); +if ($conf['breadcrumbs']) breadcrumbs(); // check upstream checkUpdateMessages(); -- cgit v1.2.3 From 58a22bd0570451af9e62b659343dd47a26bacb3f Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Sun, 14 Nov 2010 19:17:07 +0100 Subject: tmp: disable notices in doku.php --- doku.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 1303f1ade..816acd3da 100644 --- a/doku.php +++ b/doku.php @@ -26,6 +26,7 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ // load and initialize the core system require_once(DOKU_INC.'inc/init.php'); +$old = error_reporting(E_ALL ^ E_NOTICE); //import variables $QUERY = trim($_REQUEST['id']); $ID = getID(); @@ -43,6 +44,7 @@ if (isset($_POST['wikitext'])) { $PRE = cleanText(substr($_POST['prefix'], 0, -1)); $SUF = cleanText($_POST['suffix']); $SUM = $_REQUEST['summary']; +error_reporting($old); //sanitize revision $REV = preg_replace('/[^0-9]/','',$REV); -- cgit v1.2.3 From bced4159c8c5f1b4da2e98b2242c2ec1c09ec74e Mon Sep 17 00:00:00 2001 From: Adrian Lang Date: Fri, 14 Jan 2011 23:32:29 +0100 Subject: Deprecate $NS in doku.php $NS is only used in lib/exe/{ajax,mediamanager}.php when no $ID context is present. The two functions which use $NS in inc/template.php are only called through those both endpoints, not through doku.php. In doku.php, $ID is the only correct value, $NS is not kept synchronous with $ID. Use getNS($ID) in functions which are called through doku.php. --- doku.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 816acd3da..b0312fb25 100644 --- a/doku.php +++ b/doku.php @@ -30,7 +30,10 @@ $old = error_reporting(E_ALL ^ E_NOTICE); //import variables $QUERY = trim($_REQUEST['id']); $ID = getID(); + +// deprecated 2011-01-14 $NS = getNS($ID); + $REV = $_REQUEST['rev']; $IDX = $_REQUEST['idx']; $DATE = $_REQUEST['date']; -- cgit v1.2.3 From 876d3278dce690fbf6a38e29a82e8bad24813fe7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 16 Jan 2011 11:25:46 +0100 Subject: Revert "tmp: disable notices in doku.php" This reverts commit 58a22bd0570451af9e62b659343dd47a26bacb3f. It was accidentally pushed to the repo. --- doku.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index b0312fb25..d7d270d40 100644 --- a/doku.php +++ b/doku.php @@ -26,7 +26,6 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ // load and initialize the core system require_once(DOKU_INC.'inc/init.php'); -$old = error_reporting(E_ALL ^ E_NOTICE); //import variables $QUERY = trim($_REQUEST['id']); $ID = getID(); @@ -47,7 +46,6 @@ if (isset($_POST['wikitext'])) { $PRE = cleanText(substr($_POST['prefix'], 0, -1)); $SUF = cleanText($_POST['suffix']); $SUM = $_REQUEST['summary']; -error_reporting($old); //sanitize revision $REV = preg_replace('/[^0-9]/','',$REV); -- cgit v1.2.3 From dbd545d51b77a8684d6790ee5283b520884dd79f Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 16 Jan 2011 18:46:26 +0100 Subject: increased msg count --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index d7d270d40..6cd0c0e0c 100644 --- a/doku.php +++ b/doku.php @@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 29; +$updateVersion = 30; // xdebug_start_profiling(); -- cgit v1.2.3 From 4f0030dd466f56b3dc0c864656fb1bf0e76d2932 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 6 Feb 2011 19:07:31 +0100 Subject: ignore soft-hyphens for search FS#2049 This makes it possible to find words that include soft-hyphens. However, search higlighting will not work and I have no idea how to make it work. --- doku.php | 1 + 1 file changed, 1 insertion(+) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 6cd0c0e0c..dc5e0ec66 100644 --- a/doku.php +++ b/doku.php @@ -27,6 +27,7 @@ if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){ require_once(DOKU_INC.'inc/init.php'); //import variables +$_REQUEST['id'] = str_replace("\xC2\xAD",'',$_REQUEST['id']); //soft-hyphen $QUERY = trim($_REQUEST['id']); $ID = getID(); -- cgit v1.2.3