Merge branch 'wip-mdl-34040-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

This commit is contained in:
Aparup Banerjee
2012-08-29 14:45:44 +08:00
@@ -153,6 +153,7 @@ function generatePreview(c) {
pl.id = !pl.id ? 'moodlemediaid' : pl.id;
pl.name = !pl.name ? 'moodlemedianame' : pl.name;
pl.align = !pl.align ? '' : pl.align;
pl.wmode = 'transparent';
// Avoid annoying warning about insecure items
if (!tinymce.isIE || document.location.protocol != 'https:') {