[+BUGFIX] Extbase (MVC): Fix arguments object

The arguments object is now correctly inheriting from ArrayObject

Resolves: #10562

[+BUGFIX] Extbase (MVC): Make database connection work again

Resolves: #10585

diff --git a/typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php b/typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php
index 9d447f3..b9e0f54 100644 (file)
--- a/typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php
+++ b/typo3/sysext/extbase/Classes/MVC/Controller/Arguments.php
@@ -33,7 +33,7 @@
  * @version $ID:$
  * @scope prototype
  */
-class Tx_Extbase_MVC_Controller_Arguments { // extends ArrayObject {
+class Tx_Extbase_MVC_Controller_Arguments extends ArrayObject {
 
        /**
         * @var Tx_Extbase_Persistence_ManagerInterface

diff --git a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
index 4ae4001..b0dd05b 100644 (file)
--- a/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Storage/Typo3DbBackend.php
@@ -71,10 +71,10 @@ class Tx_Extbase_Persistence_Storage_Typo3DbBackend implements Tx_Extbase_Persis
        protected $tableInformationCache = array();
 
        /**
-        * @param t3lib_db $databaseHandle The database handle
+        * Constructor. takes the database handle from $GLOBALS['TYPO3_DB']
         */
-       public function injectDatabaseHandle(t3lib_db $databaseHandle) {
-               $this->databaseHandle = $databaseHandle;
+       public function __construct() {
+               $this->databaseHandle = $GLOBALS['TYPO3_DB'];
        }
 
        /**