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

MDL-79577 user: better parsing of user menu lang string identifiers.

Browse Source
This commit is contained in:
Paul Holden 2023-10-03 15:44:47 +01:00
parent 810554ee83
commit 2702ab078b
No known key found for this signature in database
GPG Key ID: A81A96D6045F6164
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tests/user_menu_test.php
View File

@ -41,6 +41,7 @@ class user_menu_test extends \advanced_testcase {
array('_____', 0, 0),
array('test', 0, 0),
array('#Garbage#', 0, 0),
array('privatefiles,/user/files.php', 0, 0),
// These are valid but have an invalid string identifiers or components. They will still produce a menu
// item, and no exception should be thrown.

9
user/lib.php
View File

@ -712,13 +712,7 @@ function user_count_login_failures($user, $reset = true) {
* @return array
*/
function user_convert_text_to_menu_items($text, $page) {
global $OUTPUT, $CFG;
$lines = explode("\n", $text);
$items = array();
$lastchild = null;
$lastdepth = null;
$lastsort = 0;
$children = array();
foreach ($lines as $line) {
$line = trim($line);
@ -746,8 +740,9 @@ function user_convert_text_to_menu_items($text, $page) {
// Name processing.
$namebits = explode(',', $bits[0], 2);
if (count($namebits) == 2) {
$namebits[1] = $namebits[1] ?: 'core';
// Check the validity of the identifier part of the string.
if (clean_param($namebits[0], PARAM_STRINGID) !== '') {
if (clean_param($namebits[0], PARAM_STRINGID) !== '' && clean_param($namebits[1], PARAM_COMPONENT) !== '') {
// Treat this as a language string.
$child->title = get_string($namebits[0], $namebits[1]);
$child->titleidentifier = implode(',', $namebits);