Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286
zendframework · Jan 3, 2013 · bb1710e · bb1710e
6 parents 4fe9653 + 0835021 + 26ee41a + be4158f + d42d41a + 97d4d4e
commit bb1710e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
@@ -460,9 +460,9 @@ public function getItem($key, & $success = null, & $casToken = null)
             return parent::getItem($key, $success, $casToken);
         } elseif ($argn > 1) {
             return parent::getItem($key, $success);
-        } else {
-            return parent::getItem($key);
         }
+
+        return parent::getItem($key);
     }
 
     /**

diff --git a/src/Storage/Adapter/WinCache.php b/src/Storage/Adapter/WinCache.php
@@ -210,9 +210,9 @@ protected function internalGetMetadata(& $normalizedKey)
             $metadata = $info['ucache_entries'][1];
             $this->normalizeMetadata($metadata);
             return $metadata;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /* writing */