diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-23 20:05:26 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-03-23 20:05:26 +0000 |
| commit | 14907be8f9af6f5ef681ce49b82c3b83df52b8a1 (patch) | |
| tree | 6b9b115707dbe3a516ff2bf9265b866eac991c4e /engine/lib | |
| parent | b3e6ac6960e56001d80243f694fe2109211a5fce (diff) | |
| download | elgg-14907be8f9af6f5ef681ce49b82c3b83df52b8a1.tar.gz elgg-14907be8f9af6f5ef681ce49b82c3b83df52b8a1.tar.bz2 | |
Added missing merge from Merge Monday.
git-svn-id: http://code.elgg.org/elgg/trunk@5487 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/elgglib.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index d7548b955..ad245ab79 100644 --- 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; |