Merge pull request #695 from njam/issue-695

smarty_function_actionAllowed: Pass arguments to isAllowed
cargomedia · Jul 16, 2013 · 4130236 · 4130236
2 parents 9c9cec3 + 68c4e95
commit 4130236
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/library/CM/SmartyPlugins/function.actionAllowed.php b/library/CM/SmartyPlugins/function.actionAllowed.php
@@ -12,9 +12,8 @@ function smarty_function_actionAllowed(array $params, Smarty_Internal_Template $
 	if (!isset($params['verb'])) {
 		trigger_error('Param `verb` missing.');
 	}
-	if (!empty($params['forceAllow'])) {
-		return true;
-	}
+
+	$arguments = isset($params['arguments']) ? (array) $params['arguments'] : array();
 
 	/** @var CM_Model_User $viewer */
 	$viewer = $template->smarty->getTemplateVars('viewer');
@@ -24,5 +23,5 @@ function smarty_function_actionAllowed(array $params, Smarty_Internal_Template $
 
 	$action = CM_Action_Abstract::factory($viewer, (int) $params['verb'], (int) $params['type']);
 
-	return $action->isAllowed();
+	return call_user_func_array(array($action, 'isAllowed'), $arguments);
 }