aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-03 10:42:12 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-10-03 10:42:12 +0000
commitadd5f3cbd9a99f90c1bcd198eb4c42d34d4acd2b (patch)
tree4c87a04f8758328e509de06463a4822ebf37b080
parentc5a9e171256127a155d8094f7b95cb5bba2b435d (diff)
downloadelgg-add5f3cbd9a99f90c1bcd198eb4c42d34d4acd2b.tar.gz
elgg-add5f3cbd9a99f90c1bcd198eb4c42d34d4acd2b.tar.bz2
Fixing installer issue.
git-svn-id: https://code.elgg.org/elgg/trunk@2164 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/install.php2
-rw-r--r--engine/settings.example.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/install.php b/engine/lib/install.php
index d24a8b120..553a6dbd6 100644
--- a/engine/lib/install.php
+++ b/engine/lib/install.php
@@ -106,7 +106,7 @@
if (!$file) return false;
foreach ($vars as $k => $v)
- $file = str_replace("{{".$k."}}", sanitise_string_special($v, '$'), $file);
+ $file = str_replace("{{".$k."}}", sanitise_string($v), $file);
return $file;
}
diff --git a/engine/settings.example.php b/engine/settings.example.php
index 94b6d5f37..f27690f57 100644
--- a/engine/settings.example.php
+++ b/engine/settings.example.php
@@ -24,22 +24,22 @@
*/
// Database username
- $CONFIG->dbuser = "{{CONFIG_DBUSER}}";
+ $CONFIG->dbuser = '{{CONFIG_DBUSER}}';
// Database password
- $CONFIG->dbpass = "{{CONFIG_DBPASS}}";
+ $CONFIG->dbpass = '{{CONFIG_DBPASS}}';
// Database name
- $CONFIG->dbname = "{{CONFIG_DBNAME}}";
+ $CONFIG->dbname = '{{CONFIG_DBNAME}}';
// Database server
// (For most configurations, you can leave this as 'localhost')
- $CONFIG->dbhost = "{{CONFIG_DBHOST}}";
+ $CONFIG->dbhost = '{{CONFIG_DBHOST}}';
// Database table prefix
// If you're sharing a database with other applications, you will want to use this
// to differentiate Elgg's tables.
- $CONFIG->dbprefix = "{{CONFIG_DBPREFIX}}";
+ $CONFIG->dbprefix = '{{CONFIG_DBPREFIX}}';
/*
* Multiple database connections