Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: clayhinson/frapi
...
head fork: clayhinson/frapi
  • 5 commits
  • 3 files changed
  • 0 commit comments
  • 3 contributors
Commits on Mar 14, 2012
David Coallier Added a fix for issue #113 (Ref #113). ab4ad5b
David Coallier Merge branch 'master' of github.com:frapi/frapi 4480d58
Commits on Mar 29, 2012
@Max13 Max13 Issue #116, thanks to davidramsden. a8a0729
David Coallier Merge pull request #119 from Max13/patch-1
Issue #116, thanks to davidramsden.
8fc08a1
Commits on Apr 04, 2012
@clayhinson Merge branch 'master' into custom_auth 322ef24
View
1  src/frapi/custom/Action/Resource.php
@@ -80,6 +80,7 @@ public function executeGet()
)
),
);
+
return $this->toArray();
}
View
2  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;
View
5 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;
}

No commit comments for this range

Something went wrong with that request. Please try again.