From a638d6de09edffc29a4fd522b0a62584a29c51ef Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Thu, 4 Dec 2014 15:26:02 +0100 Subject: Increase updateVersion for master to sync with stable hotfix --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 71eee564e..1477f806c 100644 --- a/doku.php +++ b/doku.php @@ -9,7 +9,7 @@ */ // update message version -$updateVersion = 46.1; +$updateVersion = 46.2; // xdebug_start_profiling(); -- cgit v1.2.3 From f76dd4f5e20fba6666b01fa85e451bc7404cb86a Mon Sep 17 00:00:00 2001 From: Guy Brand Date: Sat, 6 Dec 2014 23:48:32 +0100 Subject: Increasing master branch updateVersion number --- doku.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 1477f806c..7cb92cffa 100644 --- a/doku.php +++ b/doku.php @@ -9,7 +9,7 @@ */ // update message version -$updateVersion = 46.2; +$updateVersion = 47; // xdebug_start_profiling(); -- cgit v1.2.3 From 90394abd2d0fc66a994a3f81c76e265d0707b351 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 17 Dec 2014 13:14:02 +0100 Subject: fix global environment during test requests --- doku.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doku.php') diff --git a/doku.php b/doku.php index 7cb92cffa..f5aa6cfa4 100644 --- a/doku.php +++ b/doku.php @@ -15,6 +15,11 @@ $updateVersion = 47; if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/'); +// define all DokuWiki globals here (needed within test requests but also helps to keep track) +global $ACT, $INPUT, $QUERY, $ID, $REV, $DATE_AT, $IDX, + $DATE, $RANGE, $HIGH, $TEXT, $PRE, $SUF, $SUM, $INFO, $JSINFO; + + if(isset($_SERVER['HTTP_X_DOKUWIKI_DO'])) { $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO'])); } elseif(!empty($_REQUEST['idx'])) { -- cgit v1.2.3 From 421c22ae13e8de7f63d1fe6ed683ee4b8a48a8ee Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 2 May 2015 11:01:06 +0200 Subject: use string for version number. closes #1100 PHP will localize floats (eg. a 45.5 becomes 45,5 in a German locale). Using a string will prevent that. A fix has been applied on the server end, but it makes sense to always send the correct message. --- doku.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doku.php') diff --git a/doku.php b/doku.php index f5aa6cfa4..0f4557fd0 100644 --- a/doku.php +++ b/doku.php @@ -8,8 +8,8 @@ * @global Input $INPUT */ -// update message version -$updateVersion = 47; +// update message version - always use a string to avoid localized floats! +$updateVersion = "47"; // xdebug_start_profiling(); @@ -77,7 +77,7 @@ if($DATE_AT) { $DATE_AT = null; } else if ($rev_t === false) { //page did not exist $rev_n = $pagelog->getRelativeRevision($DATE_AT,+1); - msg(sprintf($lang['page_nonexist_rev'], + msg(sprintf($lang['page_nonexist_rev'], strftime($conf['dformat'],$DATE_AT), wl($ID, array('rev' => $rev_n)), strftime($conf['dformat'],$rev_n))); -- cgit v1.2.3