summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@n0v4.com>2011-04-07 00:47:30 +1000
committerSavetheinternet <savetheinternet@n0v4.com>2011-04-07 00:47:30 +1000
commit04a13e8f7707af44bea678e40df2d37205b9a64f (patch)
treebbfe8bf7b898959549c515ccbe169feff360252c
parent667b77dcbc715774d9ee758c99873a789e1358f0 (diff)
fixed database install
-rw-r--r--install.php4
-rw-r--r--install.sql7
2 files changed, 2 insertions, 9 deletions
diff --git a/install.php b/install.php
index fababd70..fc25999d 100644
--- a/install.php
+++ b/install.php
@@ -309,8 +309,8 @@
// This code is probably horrible, but what I'm trying
// to do is find all of the SQL queires and put them
// in an array.
- preg_match_all("/((SET|CREATE|INSERT).+)\n\n/msU", $sql, $queries);
- $queries = $queries[1];
+ preg_match_all("/(^|\n)((SET|CREATE|INSERT).+)\n\n/msU", $sql, $queries);
+ $queries = $queries[2];
$sql_errors = '';
foreach($queries as &$query) {
diff --git a/install.sql b/install.sql
index 098e2032..b198a23d 100644
--- a/install.sql
+++ b/install.sql
@@ -2,10 +2,7 @@
-- version 3.3.9
-- http://www.phpmyadmin.net
--
--- Host: 127.0.0.1
-- Generation Time: Apr 07, 2011 at 12:37 AM
--- Server version: 5.1.48
--- PHP Version: 5.3.2
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
@@ -15,10 +12,6 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
---
--- Database: `imgboard`
---
-
-- --------------------------------------------------------
--