summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-09-10 21:22:07 -0700
committerBharat Mediratta <bharat@menalto.com>2009-09-10 21:22:46 -0700
commit3dd40bf97c45c4cb2cc40e9f20796a799f4e1255 (patch)
treeb6ecdaf942f741d07d2b5dcdd5ee553e3bc0d3c4 /installer
parent190d7aaa55b4f55ea3d93fb8a3d4650d7e1fc85c (diff)
Trim the input line to get rid of carriage returns on Windows. Fixes
ticket #740. Thanks to jankoprowski!
Diffstat (limited to 'installer')
-rw-r--r--installer/installer.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/installer/installer.php b/installer/installer.php
index 4480e35e..7a417634 100644
--- a/installer/installer.php
+++ b/installer/installer.php
@@ -60,7 +60,7 @@ class installer {
$prefix = $config["prefix"];
$buf = null;
foreach (file(DOCROOT . "installer/install.sql") as $line) {
- $buf .= $line;
+ $buf .= trim($line);
if (preg_match("/;$/", $buf)) {
if (!mysql_query(self::prepend_prefix($prefix, $buf))) {
return false;