adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-25 16:27:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: revert return

Browse source
This commit is contained in:
LustyRain 2017-10-05 00:09:51 +09:00
parent 0f00d73c70
commit e1e5a292f2
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Event/CakeEventManager.php
View file

@ -166,8 +166,7 @@ class CakeEventManager {
*/ */
public function detach($callable, $eventKey = null) { public function detach($callable, $eventKey = null) {
if ($callable instanceof CakeEventListener) { if ($callable instanceof CakeEventListener) {
$this->_detachSubscriber($callable, $eventKey); return $this->_detachSubscriber($callable, $eventKey);
return;
} }
if (empty($eventKey)) { if (empty($eventKey)) {
foreach (array_keys($this->_listeners) as $eventKey) { foreach (array_keys($this->_listeners) as $eventKey) {

5
lib/Cake/Utility/File.php
View file

@ -581,11 +581,10 @@ class File {
*/ */
public function clearStatCache($all = false) { public function clearStatCache($all = false) {
if ($all === false && version_compare(PHP_VERSION, '5.3.0') >= 0) { if ($all === false && version_compare(PHP_VERSION, '5.3.0') >= 0) {
clearstatcache(true, $this->path); return clearstatcache(true, $this->path);
return;
} }
clearstatcache(); return clearstatcache();
} }
/** /**