Skip to content
Permalink
Browse files

Fixes failing tests

  • Loading branch information...
joezidell-saleswarp committed Sep 3, 2018
1 parent 013ecc3 commit 34bfeba15d48656401b1b824d6020a5a315f3665
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/Cake/Network/CakeRequest.php
  2. +1 −1 lib/Cake/Utility/ObjectCollection.php
@@ -303,7 +303,7 @@ protected function _base() {
return $this->base = $base;
}
if (!$baseUrl) {
if (empty($baseUrl)) {
$base = dirname(env('PHP_SELF'));
// Clean up additional / which cause following code to fail..
$base = preg_replace('#/+#', '/', $base);
@@ -126,7 +126,7 @@ public function trigger($callback, $params = array(), $options = array()) {
}
$result = null;
foreach ($list as $name) {
$result = call_user_func_array(array($this->_loaded[$name], $callback), compact('subject') + $params);
$result = call_user_func_array(array($this->_loaded[$name], $callback), array_filter(compact('subject')) + $params);
if ($options['collectReturn'] === true) {
$collected[] = $result;
}

0 comments on commit 34bfeba

Please sign in to comment.
You can’t perform that action at this time.