Fixed bug #16556: error in t3lib_sqlparser - missing second parameter in functioncall...

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

diff --git a/ChangeLog b/ChangeLog
index 5046e6d..fa99594 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-11-24  Steffen Kamper  <steffen@typo3.org>
 
 2010-11-24  Steffen Kamper  <steffen@typo3.org>
 

+       * Fixed bug #16556: error in t3lib_sqlparser - missing second parameter in functioncall parseError

        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_sqlengine
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_spritemanager
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_softrefproc
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_sqlengine
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_spritemanager
        * Fixed bug #14050: CleanUp - CGL format of t3lib files - t3lib_softrefproc

diff --git a/t3lib/class.t3lib_sqlparser.php b/t3lib/class.t3lib_sqlparser.php
index ee3d011..3866976 100644 (file)
--- a/t3lib/class.t3lib_sqlparser.php
+++ b/t3lib/class.t3lib_sqlparser.php
@@ -1078,7 +1078,7 @@ class t3lib_sqlparser {
                                                $parseString = trim(substr($parseString, 1));   // Strip of "("
                                                $stack[$level][$pnt[$level]]['func']['substr'] = $this->getValue($parseString);
                                                if (!$this->nextPart($parseString, '^(,)')) {
                                                $parseString = trim(substr($parseString, 1));   // Strip of "("
                                                $stack[$level][$pnt[$level]]['func']['substr'] = $this->getValue($parseString);
                                                if (!$this->nextPart($parseString, '^(,)')) {

-                                                       return $this->parseError('No comma found as expected in parseWhereClause()');
+                                                       return $this->parseError('No comma found as expected in parseWhereClause()', $parseString);

                                                }
                                                if ($fieldName = $this->nextPart($parseString, '^([[:alnum:]\*._]+)[[:space:]]*')) {
 
                                                }
                                                if ($fieldName = $this->nextPart($parseString, '^([[:alnum:]\*._]+)[[:space:]]*')) {
 


@@ -1098,7 +1098,7 @@ class t3lib_sqlparser {
                                                        $stack[$level][$pnt[$level]]['func']['pos'] = $this->getValue($parseString);
                                                }
                                                if (!$this->nextPart($parseString, '^([)])')) {
                                                        $stack[$level][$pnt[$level]]['func']['pos'] = $this->getValue($parseString);
                                                }
                                                if (!$this->nextPart($parseString, '^([)])')) {

-                                                       return $this->parseError('No ) parenthesis at end of function');
+                                                       return $this->parseError('No ) parenthesis at end of function', $parseString);

                                                }
                                        } elseif (preg_match('/^IFNULL[[:space:]]*[(]/i', $parseString)) {
                                                $stack[$level][$pnt[$level]]['func']['type'] = $this->nextPart($parseString, '^(IFNULL)[[:space:]]*');
                                                }
                                        } elseif (preg_match('/^IFNULL[[:space:]]*[(]/i', $parseString)) {
                                                $stack[$level][$pnt[$level]]['func']['type'] = $this->nextPart($parseString, '^(IFNULL)[[:space:]]*');


@@ -1121,7 +1121,7 @@ class t3lib_sqlparser {
                                                        $stack[$level][$pnt[$level]]['func']['default'] = $this->getValue($parseString);
                                                }
                                                if (!$this->nextPart($parseString, '^([)])')) {
                                                        $stack[$level][$pnt[$level]]['func']['default'] = $this->getValue($parseString);
                                                }
                                                if (!$this->nextPart($parseString, '^([)])')) {

-                                                       return $this->parseError('No ) parenthesis at end of function');
+                                                       return $this->parseError('No ) parenthesis at end of function', $parseString);

                                                }
                                        } elseif (preg_match('/^FIND_IN_SET[[:space:]]*[(]/i', $parseString)) {
                                                $stack[$level][$pnt[$level]]['func']['type'] = $this->nextPart($parseString, '^(FIND_IN_SET)[[:space:]]*');
                                                }
                                        } elseif (preg_match('/^FIND_IN_SET[[:space:]]*[(]/i', $parseString)) {
                                                $stack[$level][$pnt[$level]]['func']['type'] = $this->nextPart($parseString, '^(FIND_IN_SET)[[:space:]]*');