Merge branch 'master' into custom_auth

clayhinson · Apr 4, 2012 · 322ef24 · 322ef24
2 parents 75d6232 + 8fc08a1
commit 322ef24
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/frapi/custom/Action/Resource.php b/src/frapi/custom/Action/Resource.php
@@ -80,6 +80,7 @@ public function executeGet()
                 )
             ),
         );
+
         return $this->toArray();
     }
 

diff --git a/src/frapi/library/Frapi/Action.php b/src/frapi/library/Frapi/Action.php
@@ -361,7 +361,7 @@ protected function getAcceptParam($key, $type = self::TYPE_STRING, $default = nu
      */
     protected function getByKey(array $array, $key, $type = self::TYPE_STRING, $default = null, $error_name = null)
     {
-        $param = isset($this->acceptParams[$key]) ? $this->acceptParams[$key] : $default;
+        $param = isset($array[$key]) ? $array[$key] : $default;
 
         switch ($type) {
             case self::TYPE_FILE;

diff --git a/src/frapi/library/Frapi/Controller/Api.php b/src/frapi/library/Frapi/Controller/Api.php
@@ -243,7 +243,10 @@ public function processAction()
         $e = $this->getActionInstance($this->getAction())
                   ->setActionParams($this->getParams())
                   ->setActionFiles($this->getFiles())
-                  ->setAcceptParams($this->options);
+                  ->setAcceptParams(
+                      isset($this->options) && is_array($this->options) 
+                      ? $this->options : array()
+                  );
 
         return $this;
     }