1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 12:21:45 +02:00

Applying missing commits

This commit is contained in:
SecretR
2013-10-16 18:13:21 +03:00
parent 932be9aacb
commit 6ae99f2bfd
9 changed files with 43 additions and 20 deletions

View File

@@ -1207,10 +1207,10 @@ class e_parse extends e_parser
// it should work for any characters encoding
// FIXME - INVESTIGATE this one, switch to utf8 aware methods
$leftAmp = strrpos(substr($ret, -8), '&');
$leftAmp = $this->ustrrpos($this->usubstr($ret, -8), '&');
if($leftAmp)
{
$ret = substr($ret, 0, strlen($ret) - 8 + $leftAmp);
$ret = $this->usubstr($ret, 0, $this->ustrlen($ret) - 8 + $leftAmp);
}
return $ret.$more;