diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:09:55 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:09:55 -0700 |
| commit | 004200f95869c640004d920b741fd9f07835a3e2 (patch) | |
| tree | c5cec905d270d343779ee4bff3dd07f75ad6b7fb /lib/adminpanelaction.php | |
| parent | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (diff) | |
| parent | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'lib/adminpanelaction.php')
| -rw-r--r-- | lib/adminpanelaction.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index 6c9947608..9e0b2d041 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -284,9 +284,10 @@ class AdminPanelAction extends Action $this->clientError(_("Unable to delete design setting.")); return null; } + return $result; } - return $result; + return null; } function canAdmin($name) |