diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-13 00:10:41 +0200 |
commit | 572678fef95816deaa1ecafe5cbcfb8cc65963c9 (patch) | |
tree | e59df4f38865c14111d5460e85192759380786a8 /mod/install.php | |
parent | 138caa4380c442200964c8cf071438a0be89da70 (diff) | |
parent | e3af552bbfff2632bbcf2ce94c3e08ad4a5142d2 (diff) | |
download | volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.gz volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.tar.bz2 volse-hubzilla-572678fef95816deaa1ecafe5cbcfb8cc65963c9.zip |
Merge commit 'upstream/master'
Conflicts:
include/dba.php
Diffstat (limited to 'mod/install.php')
-rw-r--r-- | mod/install.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/install.php b/mod/install.php index d1142248a..2eb98ee91 100644 --- a/mod/install.php +++ b/mod/install.php @@ -451,7 +451,7 @@ function load_database_rem($v, $i){ function load_database($db) { $str = file_get_contents('database.sql'); - $str = array_reduce(explode("\n", $str),"load_database_rem",""); +// $str = array_reduce(explode("\n", $str),"load_database_rem",""); $arr = explode(';',$str); $errors = false; foreach($arr as $a) { |