mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-40877 repository_url: Use core_text functions instead of mb_strlen()

Browse Source
This commit is contained in:
Frederic Massart 2013-08-13 09:35:59 +08:00
parent aa87fe80b3
commit e5f9659b79
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
repository/url/locallib.php
View File

@ -40,6 +40,8 @@
* See: http://www.opensource.org/licenses/bsd-license.php
*/
defined('MOODLE_INTERNAL') || die();
/**
* Combine a base URL and a relative URL to produce a new
* absolute URL. The base URL is often the URL of a page,
@ -79,9 +81,9 @@ function url_to_absolute( $baseUrl, $relativeUrl )
if ( $b === FALSE || empty( $b['scheme'] ) || empty( $b['host'] ) )
return FALSE;
$r['scheme'] = $b['scheme'];
if (empty($b['path'])) {
$b['path'] = '';
}
if (empty($b['path'])) {
$b['path'] = '';
}
// If relative URL has an authority, clean path and return.
if ( isset( $r['host'] ) )
@ -110,15 +112,16 @@ function url_to_absolute( $baseUrl, $relativeUrl )
return join_url( $r );
}
// If relative URL path doesn't start with /, merge with base path
if ( $r['path'][0] != '/' )
{
$base = mb_strrchr( $b['path'], '/', TRUE, 'UTF-8' );
if ( $base === FALSE ) $base = '';
// If relative URL path doesn't start with /, merge with base path.
if ($r['path'][0] != '/') {
$base = core_text::strrchr($b['path'], '/', TRUE);
if ($base === FALSE) {
$base = '';
}
$r['path'] = $base . '/' . $r['path'];
}
$r['path'] = url_remove_dot_segments( $r['path'] );
return join_url( $r );
$r['path'] = url_remove_dot_segments($r['path']);
return join_url($r);
}
/**
@ -152,12 +155,15 @@ function url_remove_dot_segments( $path )
array_push( $outSegs, $seg );
}
$outPath = implode( '/', $outSegs );
if ( $path[0] == '/' )
if ($path[0] == '/') {
$outPath = '/' . $outPath;
// compare last multi-byte character against '/'
if ( $outPath != '/' &&
(mb_strlen($path)-1) == mb_strrpos( $path, '/', 'UTF-8' ) )
}
// Compare last multi-byte character against '/'.
if ($outPath != '/' && (core_text::strlen($path) - 1) == core_text::strrpos($path, '/', 'UTF-8')) {
$outPath .= '/';
}
return $outPath;
}