mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-15 12:45:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39444' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-05-01 16:55:36 +02:00
commit 2f679b426a
1 changed files with 2 additions and 11 deletions

13
lib/moodlelib.php

@ -6831,10 +6831,6 @@ class core_string_manager implements string_manager {
* @return boot true if exists
*/
public function string_exists($identifier, $component) {
$identifier = clean_param($identifier, PARAM_STRINGID);
if (empty($identifier)) {
return false;
}
$lang = current_language();
$string = $this->load_component_strings($component, $lang);
return isset($string[$identifier]);
@ -7312,10 +7308,6 @@ class install_string_manager implements string_manager {
* @return boot true if exists
*/
public function string_exists($identifier, $component) {
$identifier = clean_param($identifier, PARAM_STRINGID);
if (empty($identifier)) {
return false;
}
// simple old style hack ;)
$str = get_string($identifier, $component);
return (strpos($str, '[[') === false);
@ -7573,8 +7565,7 @@ function get_string($identifier, $component = '', $a = NULL, $lazyload = false)
return new lang_string($identifier, $component, $a);
}
$identifier = clean_param($identifier, PARAM_STRINGID);
if (empty($identifier)) {
if (debugging('', DEBUG_DEVELOPER) && clean_param($identifier, PARAM_STRINGID) === '') {
throw new coding_exception('Invalid string identifier. The identifier cannot be empty. Please fix your get_string() call.');
}
@ -11424,7 +11415,7 @@ class lang_string {
// Check if we need to process the string
if ($this->string === null) {
// Check the quality of the identifier.
if (clean_param($this->identifier, PARAM_STRINGID) == '') {
if (debugging('', DEBUG_DEVELOPER) && clean_param($this->identifier, PARAM_STRINGID) === '') {
throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of the string identifier. Please check your string definition');
}