Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-06-11 00:32:11 +02:00
commit b2521cfa45

View File

@ -85,7 +85,7 @@ define('URL_MATCH_EXACT', 2);
* Add quotes to HTML characters.
*
* Returns $var with HTML characters (like "<", ">", etc.) properly quoted.
* This function is very similar to {@link p()}
* Related function {@link p()} simply prints the output of this function.
*
* @param string $var the string potentially containing HTML characters
* @return string
@ -106,17 +106,14 @@ function s($var) {
* Add quotes to HTML characters.
*
* Prints $var with HTML characters (like "<", ">", etc.) properly quoted.
* This function simply calls {@link s()}
* This function simply calls & displays {@link s()}.
* @see s()
*
* @todo Remove obsolete param $obsolete if not used anywhere
*
* @param string $var the string potentially containing HTML characters
* @param boolean $obsolete no longer used.
* @return string
*/
function p($var, $obsolete = false) {
echo s($var, $obsolete);
function p($var) {
echo s($var);
}
/**