diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index b0b62b32c..56abf08ed 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -161,18 +161,6 @@ class AdminAdminController extends Admin
$this->setMessage('success_updated');
}
- /**
- * Logout
- * @return void
- */
- function procAdminLogout()
- {
- $oMemberController = getController('member');
- $oMemberController->procMemberLogout();
-
- header('Location: ' . getNotEncodedUrl(''));
- }
-
public function procAdminInsertDefaultDesignInfo()
{
$vars = Context::getRequestVars();
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 504e75d74..7a427230b 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -3,6 +3,8 @@
+
+
@@ -22,7 +24,6 @@
-
diff --git a/modules/admin/controllers/Dashboard.php b/modules/admin/controllers/Dashboard.php
index 6fb459c76..bb64ab6b2 100644
--- a/modules/admin/controllers/Dashboard.php
+++ b/modules/admin/controllers/Dashboard.php
@@ -9,6 +9,7 @@ use DocumentAdminModel;
use DocumentModel;
use CommentModel;
use MemberAdminModel;
+use MemberController;
use ModuleModel;
class Dashboard extends Base
@@ -16,12 +17,12 @@ class Dashboard extends Base
/**
* Easy install flag file
*/
- const EASYINSTALL_FLAG_FILE = 'files/env/easyinstall_last';
+ public const EASYINSTALL_FLAG_FILE = 'files/env/easyinstall_last';
/**
* Display the dashboard.
*/
- function dispAdminIndex()
+ public function dispAdminIndex()
{
// Get statistics
$args = new \stdClass;
@@ -145,6 +146,15 @@ class Dashboard extends Base
Context::set('layout', 'none');
$this->setTemplateFile('index');
}
+
+ /**
+ * Admin logout action.
+ */
+ public function procAdminLogout()
+ {
+ MemberController::getInstance()->procMemberLogout();
+ header('Location: ' . getNotEncodedUrl(''));
+ }
/**
* Check easy install.