Merge pull request #316 from getgrav/feature/conform-to-authorize

Conform to authorize

system/src/Grav/Common/Twig/TwigExtension.php

@@ -538,7 +538,7 @@ class TwigExtension extends \Twig_Extension
         $action = (array)$action;
 
         foreach ($action as $a) {
-            if ($this->grav['user']->authorise($a)) {
+            if ($this->grav['user']->authorize($a)) {
                 return true;
             }
         }

system/src/Grav/Common/User/User.php

@@ -117,7 +117,7 @@ class User extends Data
      * @param  string  $action
      * @return bool
      */
-    public function authorise($action)
+    public function authorize($action)
     {
         if (empty($this->items)) {
             return false;
@@ -125,4 +125,17 @@ class User extends Data
 
         return $this->get("access.{$action}") === true;
     }
+
+    /**
+     * Checks user authorization to the action.
+     * Ensures backwards compatibility
+     *
+     * @param  string $action
+     * @deprecated use authorize()
+     * @return bool
+     */
+    public function authorise($action)
+    {
+        $this->authorize($action);
+    }
 }