Fixes #5405 fixes fatal error

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index ec19a54763851d7514596a8348da99d003162158..243cdef4626df693ff87f52bf22c7e2a2133cd1f 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -468,14 +468,18 @@ function admin_page_handler($page) {
        $vars = array('page' => $page);
 
        // special page for plugin settings since we create the form for them
-       if ($page[0] == 'plugin_settings' && isset($page[1]) &&
-               (elgg_view_exists("settings/{$page[1]}/edit") || elgg_view_exists("plugins/{$page[1]}/settings"))) {
+       if ($page[0] == 'plugin_settings') {
+               if (isset($page[1]) && (elgg_view_exists("settings/{$page[1]}/edit") || 
+                       elgg_view_exists("plugins/{$page[1]}/settings"))) {
 
-               $view = 'admin/plugin_settings';
-               $plugin = elgg_get_plugin_from_id($page[1]);
-               $vars['plugin'] = $plugin;
+                       $view = 'admin/plugin_settings';
+                       $plugin = elgg_get_plugin_from_id($page[1]);
+                       $vars['plugin'] = $plugin;
 
-               $title = elgg_echo("admin:{$page[0]}");
+                       $title = elgg_echo("admin:{$page[0]}");
+               } else {
+                       forward('', '404');
+               }
        } else {
                $view = 'admin/' . implode('/', $page);
                $title = elgg_echo("admin:{$page[0]}");