From b2e4de0d09b62bcfc33bf7d8ff60dbf2d0f8a639 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 19 Mar 2013 21:52:50 -0600 Subject: [PATCH] Only use mb_strpos if multibyte support is requested --- lib/Sabberworm/CSS/Parser.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/Sabberworm/CSS/Parser.php b/lib/Sabberworm/CSS/Parser.php index ccbba6ae..6466a2ef 100644 --- a/lib/Sabberworm/CSS/Parser.php +++ b/lib/Sabberworm/CSS/Parser.php @@ -540,7 +540,7 @@ private function consumeUntil($aEnd, $bIncludeEnd = false) { $aEnd = is_array($aEnd) ? $aEnd : array($aEnd); $iEndPos = null; foreach ($aEnd as $sEnd) { - $iCurrentEndPos = mb_strpos($this->sText, $sEnd, $this->iCurrentPosition, $this->sCharset); + $iCurrentEndPos = $this->strpos($this->sText, $sEnd, $this->iCurrentPosition, $this->sCharset); if($iCurrentEndPos === false) { continue; } @@ -574,4 +574,12 @@ private function strlen($text) { } } + private function strpos($text, $needle, $offset, $charset) { + if ($this->oParserSettings->bMultibyteSupport) { + return mb_strpos($text, $needle, $offset, $charset); + } else { + return strpos($text, $needle, $offset); + } + } + }