* Fixed bug #1594: In t3lib_matchCondition->match() it could be the case that $this...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@815 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 6395431..af29dc9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-10-14     Andreas Otto    <andreas.otto@dkd.de>
+       * Fixed bug #1594: In t3lib_matchCondition->match() it could be the case that $this->altRootline was not allways an array, but it is supposed to be an array. Therefore at the beginning of t3lib_matchCondition->match() the variable type is checked and an empty array is created if needed.
+
 2005-10-07  Kasper Skårhøj  <kasper2005@typo3.com>
 
        * Two small friday-afternoon-party changes that I wanted to have fun with a few times: a) In the shortcut frame the "Edit Page ID" field will now let you search the whole database using the list module, b) the list module will wrap any value that is a URL or email address with a link.

diff --git a/t3lib/class.t3lib_matchcondition.php b/t3lib/class.t3lib_matchcondition.php
index 09881e0..a187033 100644 (file)
--- a/t3lib/class.t3lib_matchcondition.php
+++ b/t3lib/class.t3lib_matchcondition.php
@@ -89,6 +89,9 @@ class t3lib_matchCondition {
         * @link http://typo3.org/doc.0.html?&tx_extrepmgm_pi1[extUid]=270&tx_extrepmgm_pi1[tocEl]=292&cHash=c6c7d43d2f
         */
        function match($string) {
+               if ( !is_array( $this->altRootLine ) ) {
+                       $this->altRootLine = array();
+               }
 
                if ($this->matchAll)    return true;
                if (count($this->matchAlternative))     {