From 8783ccfd727dc4834c1f3c9460f851350fc912f4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 25 Feb 2017 16:22:09 -0800 Subject: 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. --- Zotlabs/Web/Router.php | 6 ------ include/widgets.php | 2 +- 2 files changed, 1 insertion(+), 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 = ''; -- cgit v1.2.3