Merge commit 'refs/pull/3714/head' of github.com:zendframework/zf2

PR #3714
zendframework · Feb 21, 2013 · 1a0e60f · 1a0e60f
2 parents d10a766 + a9d343d
commit 1a0e60f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/library/Zend/Session/compatibility/autoload.php b/library/Zend/Session/compatibility/autoload.php
@@ -1,5 +1,11 @@
 <?php
 if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+    if (!class_exists('Zend\Stdlib\ArrayObject', false)
+        && file_exists(__DIR__ . '/../../Stdlib/compatibility/autoload.php')
+    ) {
+        require __DIR__ . '/../../Stdlib/compatibility/autoload.php';
+    }
+
     require_once __DIR__ . '/Container.php';
     require_once __DIR__ . '/Storage/SessionArrayStorage.php';
 }
diff --git a/library/Zend/Stdlib/compatibility/autoload.php b/library/Zend/Stdlib/compatibility/autoload.php
@@ -1,4 +1,6 @@
 <?php
-if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+if (version_compare(PHP_VERSION, '5.3.4', 'lt')
+    && !class_exists('Zend\Stdlib\ArrayObject', false)
+) {
     require_once __DIR__ . '/ArrayObject.php';
 }