Skip to content

Commit

Permalink
changements mineurs
Browse files Browse the repository at this point in the history
  • Loading branch information
schpill committed Feb 10, 2017
1 parent 989baa3 commit 6ed0484
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions lib/controllerbase.php
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,11 @@ function foldersize($path)

public function __call($m, $a)
{
try {
return call_user_func_array(['\\Octo\\OctaliaHelpers', $m], $a);
} catch (\Exception $e) {
if (function_exists('\\Octo\\' . $m)) {
return call_user_func_array('\\Octo\\' . $m, $a);
}

exception('controller', "Method $m does not exist.");
if (function_exists('\\Octo\\' . $m)) {
return call_user_func_array('\\Octo\\' . $m, $a);
}

return call_user_func_array(['\\Octo\\OctaliaHelpers', $m], $a);
}

public static function __callStatic($m, $a)
Expand Down Expand Up @@ -349,4 +345,9 @@ protected function model($model, $force = false)

return $this->models[$model];
}

public function em()
{
return call_user_func_array('\\Octo\\em', func_get_args());
}
}

0 comments on commit 6ed0484

Please sign in to comment.