Skip to content

Revert "Authorization problem" #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thite-amol wants to merge 1 commit into from
Closed

Revert "Authorization problem" #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/administrator/includes/rbacl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/administrator/libraries/action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 0 additions & 2 deletions src/administrator/models/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down