Dropped header_http.inc.php

prathmeshranaut · Jun 11, 2012 · afb5600 · afb5600
1 parent ada9c98
commit afb5600
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 38 deletions.
diff --git a/index.php b/index.php
@@ -72,7 +72,7 @@
 
 
 // start output
-require 'libraries/header_http.inc.php';
+PMA_Header::sendHttpHeaders();
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

diff --git a/libraries/Header.class.php b/libraries/Header.class.php
@@ -158,11 +158,11 @@ public function sendHttpHeaders()
             header("X-Content-Security-Policy: allow 'self'; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:; script-src 'self' http://www.phpmyadmin.net");
             header("X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script");
         }
+        PMA_noCacheHeader();
         if (! defined('IS_TRANSFORMATION_WRAPPER')) {
             // Define the charset to be used
             header('Content-Type: text/html; charset=utf-8');
         }
-        PMA_no_cache_header();
     }
 
     private function _getHtmlStart()

diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
@@ -10,8 +10,7 @@
     exit;
 }
 
-// not understand
-require_once './libraries/header_http.inc.php';
+PMA_Header::sendHttpHeaders();
 
 $GLOBALS['PMD']['STYLE']          = 'default';
 

diff --git a/setup/index.php b/setup/index.php
@@ -27,7 +27,7 @@
 $action_done = preg_replace('/[^a-z_]/', '', $action_done);
 
 // send no-cache headers
-require './libraries/header_http.inc.php';
+PMA_Header::sendHttpHeaders();
 ?>
 <!DOCTYPE HTML>
 <html xmlns="http://www.w3.org/1999/xhtml">