moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now $CFG->allowobjectembed is working properly. Admins

Browse source 
will ignore this setting. Bug 3608.
(http://moodle.org/bugs/bug.php?op=show&bugid=3608)

Merged from MOODLE_15_STABLE
This commit is contained in:
stronk7 2005-06-25 15:42:44 +00:00
parent 6228b0320a
commit 5982740d30
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/setup.php
View file

@ -420,6 +420,9 @@ global $THEME;
apache_note('MOODLEUSER', $logname);
}
/// Adjust ALLOWED_TAGS
adjust_allowed_tags();
/***
*** init_performance_info() {
***

14
lib/weblib.php
View file

@ -77,10 +77,6 @@ define('FORMAT_MARKDOWN', '4'); // Markdown-formatted text http://daringfireba
$ALLOWED_TAGS =
'<p><br><b><i><u><font><table><tbody><span><div><tr><td><th><ol><ul><dl><li><dt><dd><h1><h2><h3><h4><h5><h6><hr><img><a><strong><emphasis><em><sup><sub><address><cite><blockquote><pre><strike><param><acronym><nolink><lang><tex><algebra><math><mi><mn><mo><mtext><mspace><ms><mrow><mfrac><msqrt><mroot><mstyle><merror><mpadded><mphantom><mfenced><msub><msup><msubsup><munder><mover><munderover><mmultiscripts><mtable><mtr><mtd><maligngroup><malignmark><maction><cn><ci><apply><reln><fn><interval><inverse><sep><condition><declare><lambda><compose><ident><quotient><exp><factorial><divide><max><min><minus><plus><power><rem><times><root><gcd><and><or><xor><not><implies><forall><exists><abs><conjugate><eq><neq><gt><lt><geq><leq><ln><log><int><diff><partialdiff><lowlimit><uplimit><bvar><degree><set><list><union><intersect><in><notin><subset><prsubset><notsubset><notprsubset><setdiff><sum><product><limit><tendsto><mean><sdev><variance><median><mode><moment><vector><matrix><matrixrow><determinant><transpose><selector><annotation><semantics><annotation-xml><tt><code>';
if (!empty($CFG->allowobjectembed)) {
$ALLOWED_TAGS .= '<embed><object>';
}
/**
* Allowed protocols - array of protocols that are safe to use in links and so on
* @global string $ALLOWED_PROTOCOLS
@ -4177,7 +4173,17 @@ function print_maintenance_message () {
print_footer();
}
/**
* Adjust the list of allowed tags based on $CFG->allowobjectembed and user roles (admin)
*/
function adjust_allowed_tags() {
global $CFG, $ALLOWED_TAGS;
if (!empty($CFG->allowobjectembed) || isadmin()) {
$ALLOWED_TAGS .= '<embed><object>';
}
}
/// Some code to print tabs