summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-10-27 20:53:59 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-10-27 20:53:59 +0200
commit55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8 (patch)
tree1bf1359fee6044a704ac8465753e3c147d61e6e3 /install.php
parente8b9cf5ae263f3b97aaa389dddd9e7458cc0894c (diff)
parentbaef77a2b52933a6dd7caf3f641ff5ce6e6164f3 (diff)
downloadrpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.gz
rpg-55b3c9e8ad80fc80ec9ecaac33474e186cb88ee8.tar.bz2
Merge branch 'master' into stable
Diffstat (limited to 'install.php')
-rw-r--r--install.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/install.php b/install.php
index 98b729a4d..6c03893f5 100644
--- a/install.php
+++ b/install.php
@@ -46,7 +46,7 @@ $dokuwiki_hash = array(
'2008-05-04' => '1e5c42eac3219d9e21927c39e3240aad',
'2009-02-14' => 'ec8c04210732a14fdfce0f7f6eead865',
'2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
- '2010-10-07rc' => '7921d48195f4db21b8ead6d9bea801b8'
+ '2010-10-27rc' => '7921d48195f4db21b8ead6d9bea801b8'
);
@@ -295,7 +295,7 @@ function store_data($d){
$d['policy'] = (int) $d['policy'];
// create local.php
- $now = date('r');
+ $now = gmdate('r');
$output = <<<EOT
<?php
/**