diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:05:53 -0700 |
| commit | 7f3b3620af2af88ced37da1d9f8913cfd1a31b90 (patch) | |
| tree | 13f137c377c3dfebbb2e749866e958ede08c2d24 /lib/adminpanelaction.php | |
| parent | e81f17e911f59c5ba68fddefd318ea6caf25924c (diff) | |
| parent | 47665e845ae74e6ee5b9a39565fb45dd9a93f921 (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.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 e22804fc8..41cfe5851 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) |