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

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..16682b0
--- /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 35ac224dc86bcf1bae297f7a26f41af6f448a785..bcc156e4f64f35a825a2469f64a2a627290715fc 100644 (file)
--- 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 f2772b8e65f28fae0f1aa30d81d048273a26cf55..07ca9b6425e9a3b55d43b17ddcc872f371e878fb 100644 (file)
--- 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 de2cccf5879c5fce86a235f4ca312368043ee288..e52e3b0563dcdc853feca677f11e8b1dd8d37ccb 100644 (file)
--- 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")) {