Merge branch 'MDL-55114-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:44:52 +0000 (12:44 +0200)
1  2 
mod/chat/gui_header_js/jsupdate.php
mod/chat/gui_header_js/jsupdated.php

@@@ -98,13 -98,6 +98,6 @@@ header('Pragma: no-cache')
  header('Content-Type: text/html; charset=utf-8');
  header("Refresh: $CFG->chat_refresh_room; url=$refreshurl");
  
- // Required stylesheets.
- $stylesheetshtml = '';
- /*foreach ($CFG->stylesheets as $stylesheet) {
-     //TODO: MDL-21120
-     $stylesheetshtml .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />';
- }*/
  // Use ob to be able to send Content-Length headers.
  // Needed for Keep-Alive to work.
  ob_start();
          <meta http-equiv="content-type" content="text/html; charset=utf-8" />
          <script type="text/javascript">
          //<![CDATA[
 -        function safari_refresh() {
 -            self.location.href= '<?php echo $refreshurl;?>';
 -        }
 -        var issafari = false;
 -        if (window.devicePixelRatio) {
 -            issafari = true;
 -            setTimeout('safari_refresh()', <?php echo $CFG->chat_refresh_room * 1000;?>);
 -        }
          if (parent.msg && parent.msg.document.getElementById("msgStarted") == null) {
              parent.msg.document.close();
              parent.msg.document.open("text/html","replace");
              parent.msg.document.write("<html><head>");
              parent.msg.document.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />");
              parent.msg.document.write("<base target=\"_blank\" />");
-             parent.msg.document.write("<?php echo addslashes_js($stylesheetshtml) ?>");
              parent.msg.document.write("<\/head><body class=\"mod-chat-gui_header_js course-<?php echo $chatuser->course ?>\" id=\"mod-chat-gui_header_js-jsupdate\"><div style=\"display: none\" id=\"msgStarted\">&nbsp;<\/div>");
          }
  <?php
@@@ -90,13 -90,6 +90,6 @@@ header('Cache-Control: no-cache, must-r
  header('Pragma: no-cache');
  header('Content-Type: text/html; charset=utf-8');
  
- // Required stylesheets.
- $stylesheetshtml = '';
- /*foreach ($CFG->stylesheets as $stylesheet) {
-     //TODO: MDL-21120
-     $stylesheetshtml .= '<link rel="stylesheet" type="text/css" href="'.$stylesheet.'" />';
- }*/
  $refreshurl = "{$CFG->wwwroot}/mod/chat/gui_header_js/jsupdated.php?".
                "chat_sid=$chatsid&chat_lasttime=$chatlasttime&chat_lastrow=$chatnewrow&chat_lastid=$chatlastid";
  ?>
          <meta http-equiv="content-type" content="text/html; charset=utf-8" />
          <script type="text/javascript">
          //<![CDATA[
 -        function safari_refresh() {
 -            self.location.href= '<?php echo $refreshurl;?>';
 -        }
 -        var issafari = false;
 -        if(window.devicePixelRatio){
 -            issafari = true;
 -            setTimeout('safari_refresh()', <?php echo $CFG->chat_refresh_room * 1000;?>);
 -        }
          if (parent.msg.document.getElementById("msgStarted") == null) {
              parent.msg.document.close();
              parent.msg.document.open("text/html","replace");
              parent.msg.document.write("<html><head>");
              parent.msg.document.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />");
              parent.msg.document.write("<base target=\"_blank\" />");
-             parent.msg.document.write("<?php echo addslashes_js($stylesheetshtml) ?>");
              parent.msg.document.write("</head><body class=\"mod-chat-gui_header_js course-<?php echo $chatuser->course ?>\" id=\"mod-chat-gui_header_js-jsupdate\"><div style=\"display: none\" id=\"msgStarted\">&nbsp;</div>");
          }
          //]]>