mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle
This commit is contained in:
commit
62b214d9a6
10 changed files with 22 additions and 22 deletions
|
@ -1300,8 +1300,8 @@ function wiki_print_page_content($page, $context, $subwikiid) {
|
|||
*/
|
||||
function wiki_trim_string($text, $limit = 25) {
|
||||
|
||||
if (strlen($text) > $limit) {
|
||||
$text = substr($text, 0, $limit) . '...';
|
||||
if (textlib::strlen($text) > $limit) {
|
||||
$text = textlib::substr($text, 0, $limit) . '...';
|
||||
}
|
||||
|
||||
return $text;
|
||||
|
|
|
@ -1606,7 +1606,7 @@ class page_wiki_map extends page_wiki {
|
|||
$strspecial = get_string('special', 'wiki');
|
||||
|
||||
foreach ($pages as $page) {
|
||||
$letter = strtoupper(substr($page->title, 0, 1));
|
||||
$letter = textlib::strtoupper(textlib::substr($page->title, 0, 1));
|
||||
if (preg_match('/[A-Z]/', $letter)) {
|
||||
$stdaux->{
|
||||
$letter}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue