Merge branch 'develop'

tubepress · Apr 25, 2015 · fbc661e · fbc661e
2 parents 11a2c6c + a213135
commit fbc661e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 51 deletions.
diff --git a/build/config/common.properties b/build/config/common.properties
@@ -1,3 +1,3 @@
 version.major=4
 version.minor=1
-version.micro=5
+version.micro=6
diff --git a/composer.lock b/composer.lock
diff --git a/src/add-ons/core/classes/tubepress/lib/impl/array/ArrayReader.php b/src/add-ons/core/classes/tubepress/lib/impl/array/ArrayReader.php
@@ -15,16 +15,6 @@
  */
 class tubepress_lib_impl_array_ArrayReader implements tubepress_lib_api_array_ArrayReaderInterface
 {
-    /**
-     * @var bool
-     */
-    private $_php53orHigher;
-
-    public function __construct()
-    {
-        $this->_php53orHigher = version_compare(PHP_VERSION, '5.3.0') >= 0;
-    }
-
     /**
      * @api
      * @since 4.1.0
@@ -174,19 +164,9 @@ private function _getValueFromPath(array $array, $aPath)
 
         foreach ($pathKeys as $pathKey) {
 
-            if ($this->_php53orHigher) {
-
-                if (!isset($intermediate[$pathKey])) {
-
-                    return null;
-                }
-
-            } else {
-
-                if (!is_array($intermediate) || !array_key_exists($pathKey, $intermediate)) {
+            if (!is_array($intermediate) || !array_key_exists($pathKey, $intermediate)) {
 
-                    return null;
-                }
+                return null;
             }
 
             $intermediate = $intermediate[$pathKey];