From 49b7a3de37f0fb93b77653accab629905c59229b Mon Sep 17 00:00:00 2001 From: Amol Date: Mon, 3 Sep 2018 12:40:10 +0530 Subject: [PATCH] Revert "Authorization problem" --- src/administrator/includes/rbacl.php | 4 +--- src/administrator/libraries/action.php | 2 +- src/administrator/models/user.php | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/administrator/includes/rbacl.php b/src/administrator/includes/rbacl.php index be4ff87..7039cae 100644 --- a/src/administrator/includes/rbacl.php +++ b/src/administrator/includes/rbacl.php @@ -154,12 +154,10 @@ public static function check($userId, $client, $action, $contentId = null) */ public static function authorise($userId, $client, $action, $contentId = null) { - $client = (string) $client; - $action = (string) $action; $user = Factory::getUser($userId); $result = $user->authorise($action, $client); - return $result && self::check($userId, $client, $action, $contentId); + return $result && self::check($userId, $client, $action); } /** diff --git a/src/administrator/libraries/action.php b/src/administrator/libraries/action.php index 855e4d1..e81200c 100644 --- a/src/administrator/libraries/action.php +++ b/src/administrator/libraries/action.php @@ -188,7 +188,7 @@ public function bind(&$array) * * @since __DEPLOY_VERSION__ */ - public static function loadActionByCode($code, $client) + public static function loadActionByCode(String $code, String $client) { $table = RBACL::table("action"); $table->load(array("code" => $code, "client" => $client)); diff --git a/src/administrator/models/user.php b/src/administrator/models/user.php index 1eb049a..70f4e17 100755 --- a/src/administrator/models/user.php +++ b/src/administrator/models/user.php @@ -39,8 +39,6 @@ class SubusersModelUser extends AdminModel */ public function getTable($type = 'User', $prefix = 'SubusersTable', $config = array()) { - Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_subusers/tables'); - return Table::getInstance($type, $prefix, $config); }