From fa446926c63aef4f4f394967b84d20e2da0dad6d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sun, 29 Jul 2012 12:09:42 +0200 Subject: more utf8_basename fixes --- inc/utf8.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'inc/utf8.php') diff --git a/inc/utf8.php b/inc/utf8.php index e3e7e8c1a..6fab8502c 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -91,10 +91,9 @@ if(!function_exists('utf8_basename')){ * @return string */ function utf8_basename($path, $suffix=''){ - $slashrpos = strrpos($path, '/'); - $bslashrpos = strrpos($path, '\\'); - $rpos = max($slashrpos === false ? -1 : $slashrpos, $bslashrpos === false ? -1 : $bslashrpos); - $path = substr($path, $rpos+1); + $path = trim($path,'\\/'); + $rpos = max(strrpos($path, '/'), strrpos($path, '\\')); + if($rpos) $path = substr($path, $rpos+1); $suflen = strlen($suffix); if($suflen && (substr($path, -$suflen) == $suffix)){ -- cgit v1.2.3