MDL-44650 Remove invalid meta tags "pragma" and "expires"

NoelDeMartin · Mar 14, 2014 · db64fd6 · db64fd6
1 parent c0e8812
commit db64fd6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/lib/installlib.php b/lib/installlib.php
@@ -278,10 +278,7 @@ function install_print_help_page($help) {
           <link rel="stylesheet" type="text/css" href="'.$CFG->wwwroot.'/install/css.php" />
           <title>'.get_string('installation','install').'</title>
           <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-          <meta http-equiv="pragma" content="no-cache" />
-          <meta http-equiv="expires" content="0" />';
-
-    echo '</head><body>';
+          </head><body>';
     switch ($help) {
         case 'phpversionhelp':
             print_string($help, 'install', phpversion());

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -364,10 +364,6 @@ public function standard_head_html() {
         $output = '';
         $output .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . "\n";
         $output .= '<meta name="keywords" content="moodle, ' . $this->page->title . '" />' . "\n";
-        if (!$this->page->cacheable) {
-            $output .= '<meta http-equiv="pragma" content="no-cache" />' . "\n";
-            $output .= '<meta http-equiv="expires" content="0" />' . "\n";
-        }
         // This is only set by the {@link redirect()} method
         $output .= $this->metarefreshtag;