diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-11 12:04:03 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-11 12:04:03 -0700 |
| commit | 47665e845ae74e6ee5b9a39565fb45dd9a93f921 (patch) | |
| tree | a24680e60e250f085c7290c8fa0ecbc3ec4c6ea8 /lib/adminpanelaction.php | |
| parent | ec155464765db36591bbb183b335abbc1ec8638c (diff) | |
| parent | 054ac909bf6222254cf9b2c3a4eda824f4f4eb8f (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
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 a927e2333..7d6a616eb 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -283,9 +283,10 @@ class AdminPanelAction extends Action $this->clientError(_("Unable to delete design setting.")); return null; } + return $result; } - return $result; + return null; } function canAdmin($name) |