diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Dom/Query/Css2Xpath.php --- a/web/lib/Zend/Dom/Query/Css2Xpath.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Dom/Query/Css2Xpath.php Thu Mar 21 19:50:53 2013 +0100 @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Dom - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,9 +23,9 @@ * * @package Zend_Dom * @subpackage Query - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Css2Xpath.php 22044 2010-04-28 19:58:29Z matthew $ + * @version $Id: Css2Xpath.php 24593 2012-01-05 20:35:02Z matthew $ */ class Zend_Dom_Query_Css2Xpath { @@ -121,8 +121,8 @@ // Classes $expression = preg_replace( - '|\.([a-z][a-z0-9_-]*)|i', - "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]", + '|\.([a-z][a-z0-9_-]*)|i', + "[contains(concat(' ', normalize-space(@class), ' '), ' \$1 ')]", $expression ); @@ -134,8 +134,8 @@ /** * Callback for creating equality expressions - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _createEqualityExpression($matches) @@ -145,25 +145,25 @@ /** * Callback for creating expressions to match one or more attribute values - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _normalizeSpaceAttribute($matches) { - return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' " + return "[contains(concat(' ', normalize-space(@" . strtolower($matches[1]) . "), ' '), ' " . $matches[2] . " ')]"; } /** * Callback for creating a strict "contains" expression - * - * @param array $matches + * + * @param array $matches * @return string */ protected static function _createContainsExpression($matches) { - return "[contains(@" . strtolower($matches[1]) . ", '" + return "[contains(@" . strtolower($matches[1]) . ", '" . $matches[2] . "')]"; } }