[BUGFIX] Remove calls to PHP4 constructors from core
authorStefano Kowalke <blueduck@gmx.net>
Tue, 24 May 2011 09:31:15 +0000 (11:31 +0200)
committerSteffen Gebert <steffen.gebert@typo3.org>
Wed, 1 Jun 2011 17:40:21 +0000 (19:40 +0200)
After moving from PHP4 to PHP5 constructors fatal PHP error occurs because core still calling PHP4 constructors.

Change-Id: I5633413553431d85955282b2e1b9ef869aa8b7c2
Resolves: #27001
Related: #26505
Releases: 4.6
Reviewed-on: http://review.typo3.org/2331
Reviewed-by: Oliver Klee
Reviewed-by: Patrick Rodacker
Tested-by: Patrick Rodacker
Reviewed-by: Stefan Neufeind
Reviewed-by: Xavier Perseguers
Reviewed-by: Steffen Gebert
Tested-by: Steffen Gebert
typo3/class.browse_links.php
typo3/sysext/cms/tslib/class.tslib_menu.php
typo3/sysext/cms/tslib/interfaces/interface.tslib_menu_filterMenuPagesHook.php

index 6ee2644..d90da58 100644 (file)
@@ -457,7 +457,7 @@ class localFolderTree extends t3lib_folderTree {
         */
        function __construct() {
                $this->thisScript = t3lib_div::getIndpEnv('SCRIPT_NAME');
-               $this->t3lib_folderTree();
+               parent::__construct();
        }
 
        /**
index 5940ae3..27abe3d 100644 (file)
@@ -972,7 +972,7 @@ class tslib_menu {
                                        throw new UnexpectedValueException('$hookObject must implement interface tslib_menu_filterMenuPagesHook', 1269877402);
                                }
 
-                               $includePage = $includePage && $hookObject->tslib_menu_filterMenuPagesHook($data, $banUidArray, $spacer, $this);
+                               $includePage = $includePage && $hookObject->processFilter($data, $banUidArray, $spacer, $this);
                        }
                }
                if (!$includePage) {
index 7405cc6..9249eee 100644 (file)
@@ -44,7 +44,7 @@ interface tslib_menu_filterMenuPagesHook {
         * @param       tslib_menu      The menu object
         * @return      boolean         Returns TRUE if the page can be safely included.
         */
-       public function __construct (array &$data, array $banUidArray, $spacer, tslib_menu $obj);
+       public function processFilter (array &$data, array $banUidArray, $spacer, tslib_menu $obj);
 }
 
 ?>
\ No newline at end of file