Permalink
Browse files

Merge branch 'master' into custom_auth

  • Loading branch information...
2 parents 75d6232 + 8fc08a1 commit 322ef24974ccffe3d1b4b1753625c7cd1ec9a7db @clayhinson committed Apr 4, 2012
@@ -80,6 +80,7 @@ public function executeGet()
)
),
);
+
return $this->toArray();
}
@@ -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;
@@ -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;
}

0 comments on commit 322ef24

Please sign in to comment.