From 75930869ddcb31470ea7617eddfb882de02645df Mon Sep 17 00:00:00 2001
From: Guy Brand <gb@unistra.fr>
Date: Mon, 5 May 2014 22:48:47 +0200
Subject: Release preparation

---
 install.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 779084cfa..acc96d3e6 100644
--- a/install.php
+++ b/install.php
@@ -57,6 +57,7 @@ $dokuwiki_hash = array(
     '2012-09-10'   => 'eb0b3fc90056fbc12bac6f49f7764df3',
     '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
     '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
+    '2014-05-05'   => '263c76af309fbf083867c18a34ff5214',
 );
 
 
-- 
cgit v1.2.3


From 7f41344085d6bab6b602773f09c85534c9ad36cf Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 24 May 2014 19:58:29 +0200
Subject: check mbstring function overloading in installer. closes #736

---
 install.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'install.php')

diff --git a/install.php b/install.php
index acc96d3e6..20402d3ff 100644
--- a/install.php
+++ b/install.php
@@ -533,6 +533,11 @@ function check_functions(){
         $ok = false;
     }
 
+    if(ini_get('mbstring.func_overload') != 0){
+        $error[] = $lang['i_mbfuncoverload'];
+        $ok = false;
+    }
+
     $funcs = explode(' ','addslashes call_user_func chmod copy fgets '.
                          'file file_exists fseek flush filesize ftell fopen '.
                          'glob header ignore_user_abort ini_get mail mkdir '.
-- 
cgit v1.2.3


From 2613efa18dacc46df06cc448fee733c0467a073f Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 22 Jun 2014 00:00:41 +0200
Subject: allow config presets with installer

this adds the ability to place a install.conf file next to the
install.php which contains additional config options to be written to
conf/local.php on completion of the installer. The install.conf is
automatically deleted then.

This is useful for automated DokuWiki installers or downloaders that
take care of downloading DokuWiki and then drop the user in the default
install dialog for initial setup. These tools may set up host specific
things options like rewrites, image magic path or file permission
settings in this preset.
---
 install.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'install.php')

diff --git a/install.php b/install.php
index 20402d3ff..767dd332f 100644
--- a/install.php
+++ b/install.php
@@ -58,6 +58,7 @@ $dokuwiki_hash = array(
     '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
     '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
     '2014-05-05'   => '263c76af309fbf083867c18a34ff5214',
+    'devel'        => 'b3ddc3f793eac8c135176e535054c00a',
 );
 
 
@@ -350,6 +351,16 @@ function store_data($d){
  */
 
 EOT;
+    // add any config options set by a previous installer
+    $preset = __DIR__.'/install.conf';
+    if(file_exists($preset)){
+        $output .= "# preset config options\n";
+        $output .= file_get_contents($preset);
+        $output .= "\n\n";
+        $output .= "# options selected in installer\n";
+        @unlink($preset);
+    }
+
     $output .= '$conf[\'title\'] = \''.addslashes($d['title'])."';\n";
     $output .= '$conf[\'lang\'] = \''.addslashes($LC)."';\n";
     $output .= '$conf[\'license\'] = \''.addslashes($d['license'])."';\n";
-- 
cgit v1.2.3