Merge branch 'testing' into 0.9.x

Conflicts:
	db/08to09.sql

1 files changed, 1 insertions, 1 deletions

diff --git a/actions/sitenoticeadminpanel.php b/actions/sitenoticeadminpanel.php
index 613a2e96b..3931aa982 100644
--- a/actions/sitenoticeadminpanel.php
+++ b/actions/sitenoticeadminpanel.php
@@ -99,7 +99,7 @@ class SitenoticeadminpanelAction extends AdminPanelAction
 
         $result = Config::save('site', 'notice', $siteNotice);
 
-        if (!result) {
+        if (!$result) {
             $this->ServerError(_("Unable to save site notice."));
         }
     }