diff options
| author | zotlabs <mike@macgirvin.com> | 2017-02-25 16:22:09 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-02-25 16:22:09 -0800 |
| commit | 8783ccfd727dc4834c1f3c9460f851350fc912f4 (patch) | |
| tree | ca30942fe4c748a43baf2d9600ae040201b74bd7 | |
| parent | 92615247ac46e708de46651f21a4a179c38068c4 (diff) | |
| download | volse-hubzilla-8783ccfd727dc4834c1f3c9460f851350fc912f4.tar.gz volse-hubzilla-8783ccfd727dc4834c1f3c9460f851350fc912f4.tar.bz2 volse-hubzilla-8783ccfd727dc4834c1f3c9460f851350fc912f4.zip | |
move admin permission decision out of the router - it is already provided in the module and the higher level check is causing some oembed redirect issues.
| -rw-r--r-- | Zotlabs/Web/Router.php | 6 | ||||
| -rw-r--r-- | include/widgets.php | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index ba2e78b25..948f073d6 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -62,12 +62,6 @@ class Router { } } - if((strpos($module,'admin') === 0) && (! is_site_admin())) { - \App::$module_loaded = false; - notice( t('Permission denied.') . EOL); - goaway(z_root()); - } - /* * If the site has a custom module to over-ride the standard module, use it. * Otherwise, look for the standard program module diff --git a/include/widgets.php b/include/widgets.php index 04cf0d30b..14345cf2f 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1566,7 +1566,7 @@ function widget_admin($arr) { */ if(! is_site_admin()) { - return login(false); + return ''; } $o = ''; |