diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-16 00:58:47 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-16 00:58:47 +0000 |
| commit | 2e1e7b19be7bcb78652b8da599183896246ecaf5 (patch) | |
| tree | 96220d252ea58d0ae6106784fb558c512bbda9b0 | |
| parent | 10610a6f81ece9cfcbf220f78a62dc6735b48698 (diff) | |
| download | elgg-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
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | engine/lib/actions.php | 2 | ||||
| -rw-r--r-- | engine/settings.example.php | 2 | ||||
| -rw-r--r-- | install/ElggInstaller.php | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..16682b00d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.htaccess +engine/settings.php diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 35ac224dc..bcc156e4f 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -42,7 +42,7 @@ * * @note If an action isn't registered in the system or is registered * to an unavailable file the user will be forwarded to the site front -* page and an error will be emitted via {@link regiser_error()}. +* page and an error will be emitted via {@link register_error()}. * * @warning All actions require {@link http://docs.elgg.org/Actions/Tokens Action Tokens}. * @warning Most plugin shouldn't call this manually. diff --git a/engine/settings.example.php b/engine/settings.example.php index f2772b8e6..07ca9b642 100644 --- a/engine/settings.example.php +++ b/engine/settings.example.php @@ -1,6 +1,6 @@ <?php /** - * Defines database creditials. + * Defines database credentials. * * Most of Elgg's configuration is stored in the database. This file contains the * credentials to connect to the database, as well as a few optional configuration 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")) { |