Added missing merge from Merge Monday.

git-svn-id: http://code.elgg.org/elgg/trunk@5487 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index d7548b955711a0574f39e75a5b5686a53eeb3440..ad245ab79bdd8b3337de0d057b630398d62ddbc7 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1378,7 +1378,7 @@ function sanitised() {
                                                                        $save_vars['CONFIG_DBHOST'] );
                        if ($rtn == FALSE) {
                                register_error(elgg_view("messages/sanitisation/dbsettings_error"));
-                               register_error(elgg_view("messages/sanitisation/settings", 
+                               register_error(elgg_view("messages/sanitisation/settings",
                                                                array(  'settings.php' => $result,
                                                                                'sticky' => $save_vars)));
                                return FALSE;