From 3d18fb588afbccabd26dc49624d084380b1676fd Mon Sep 17 00:00:00 2001
From: Rouslan Placella <rouslan@placella.com>
Date: Tue, 29 May 2012 13:01:58 +0100
Subject: [PATCH] Got rid of some dead code from gis_data_editor.php

---
 gis_data_editor.php | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 70c96718b3..83b59fe34a 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -1,10 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 require_once 'libraries/common.inc.php';
-if (! isset($_REQUEST['get_gis_editor']) && ! isset($_REQUEST['generate'])) {
-    include_once 'libraries/header_http.inc.php';
-    include_once 'libraries/header_meta_style.inc.php';
-}
 require_once 'libraries/gis/pma_gis_factory.php';
 require_once 'libraries/gis_visualization.lib.php';
 
@@ -69,15 +65,7 @@ if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) {
     PMA_ajaxResponse(null, true, $extra_data);
 }
 
-// If the call is to get the whole content, start buffering, skipping </head> and <body> tags
-if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
-    ob_start();
-} else {
-?>
-</head>
-<body>
-<?php
-}
+ob_start();
 ?>
     <form id="gis_data_editor_form" action="gis_data_editor.php" method="post">
     <input type="hidden" id="pmaThemeImage" value="<?php echo($GLOBALS['pmaThemeImage']); ?>" />
@@ -323,18 +311,7 @@ if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
     </form>
 <?php
 
-// If the call is to get the whole content, get the content in the buffer and make and AJAX response.
-if (isset($_REQUEST['get_gis_editor']) && $_REQUEST['get_gis_editor'] == true) {
-    $extra_data['gis_editor'] = ob_get_contents();
-    PMA_ajaxResponse(null, ob_end_clean(), $extra_data);
-}
-?>
-</body>
-
-<?php
-/**
- * Displays the footer
- */
-require 'libraries/footer.inc.php';
+$extra_data['gis_editor'] = ob_get_contents();
+PMA_ajaxResponse(null, ob_end_clean(), $extra_data);
 
 ?>
