D3758.id9736.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3758.id9736.diff
View Options

	diff --git a/workspaces/src/includes/GlobalFunctions.php b/workspaces/src/includes/GlobalFunctions.php
	--- a/workspaces/src/includes/GlobalFunctions.php
	+++ b/workspaces/src/includes/GlobalFunctions.php
	@@ -41,7 +41,7 @@
	* @param $identifier resource identifier
	* @return mixed the resource ID (as integer), or NULL if unknown
	*/
	-function get_resource_id ($resource_type, $identifier) {
	+function resolve_resource_id ($resource_type, $identifier) {
	//Trivial cases: already an ID, null or void ID
	if (is_numeric($identifier)) {
	return $identifier;
	diff --git a/workspaces/src/includes/auth/GivePermissionUserAction.php b/workspaces/src/includes/auth/GivePermissionUserAction.php
	--- a/workspaces/src/includes/auth/GivePermissionUserAction.php
	+++ b/workspaces/src/includes/auth/GivePermissionUserAction.php
	@@ -44,7 +44,7 @@
	* Executes the user action
	*/
	public function run () {
	- if (!$id = get_resource_id($this->resourceType, $this->resourceIdentifier)) {
	+ if (!$id = resolve_resource_id($this->resourceType, $this->resourceIdentifier)) {
	throw new Exception("Can't get identifier from resource " . $this->resourceType . " " . $this->resourceIdentifier);
	}
	$this->targetUser->setPermission(