aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-16 00:58:47 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-16 00:58:47 +0000
commit2e1e7b19be7bcb78652b8da599183896246ecaf5 (patch)
tree96220d252ea58d0ae6106784fb558c512bbda9b0 /install
parent10610a6f81ece9cfcbf220f78a62dc6735b48698 (diff)
downloadelgg-2e1e7b19be7bcb78652b8da599183896246ecaf5.tar.gz
elgg-2e1e7b19be7bcb78652b8da599183896246ecaf5.tar.bz2
Pulled in hellekin's fixes from https://github.com/Elgg/Elgg/pull/2
git-svn-id: http://code.elgg.org/elgg/trunk@7324 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'install')
-rw-r--r--install/ElggInstaller.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index de2cccf58..e52e3b056 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -555,7 +555,7 @@ class ElggInstaller {
}
/**
- * Check the different nstall steps for completion
+ * Check the different install steps for completion
*
* @return void
*/
@@ -889,7 +889,7 @@ class ElggInstaller {
*
* @return bool
*/
- protected function checkSettingsFile(&$report) {
+ protected function checkSettingsFile(&$report = array()) {
global $CONFIG;
if (!file_exists("{$CONFIG->path}engine/settings.php")) {