RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-1237 - Remove dependency to mbstring

Browse source
This commit is contained in:
Benjamin Eberlei 2011-11-12 09:43:37 +01:00
parent 4d425317b4
commit a14ba1e561
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Doctrine/ORM/Query/Expr/Composite.php
View file

@ -39,30 +39,30 @@ class Composite extends Base
if ($this->count() === 1) { if ($this->count() === 1) {
return (string) $this->_parts[0]; return (string) $this->_parts[0];
} }
$components = array(); $components = array();
foreach ($this->_parts as $part) { foreach ($this->_parts as $part) {
$components[] = $this->processQueryPart($part); $components[] = $this->processQueryPart($part);
} }
return implode($this->_separator, $components); return implode($this->_separator, $components);
} }
private function processQueryPart($part) private function processQueryPart($part)
{ {
$queryPart = (string) $part; $queryPart = (string) $part;
if (is_object($part) && $part instanceof self && $part->count() > 1) { if (is_object($part) && $part instanceof self && $part->count() > 1) {
return $this->_preSeparator . $queryPart . $this->_postSeparator; return $this->_preSeparator . $queryPart . $this->_postSeparator;
} }
// Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND") // Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND")
if (mb_stripos($queryPart, ' OR ') !== false || mb_stripos($queryPart, ' AND ') !== false) { if (stripos($queryPart, ' OR ') !== false || stripos($queryPart, ' AND ') !== false) {
return $this->_preSeparator . $queryPart . $this->_postSeparator; return $this->_preSeparator . $queryPart . $this->_postSeparator;
} }
return $queryPart; return $queryPart;
} }
} }