From e7d20c38bf25bea32363131944a8d67a9222e153 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 29 Dec 2009 17:45:15 +0000
Subject: [PATCH] XHTML improvements

---
 libraries/display_import.lib.php | 4 ++++
 libraries/header_scripts.inc.php | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index a688541ed..c412493d3 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -31,6 +31,7 @@ if (empty($import_list)) {
 <div id="importmain">
 <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> 
 <script type="text/javascript">
+//<![CDATA[
 <!--
 // Mootools code for handling Ajax requests
   window.addEvent('load', function() {
@@ -95,11 +96,13 @@ if (empty($import_list)) {
 	      $('import_form_status').setStyle('display', 'inline');
 	      $('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportProceedingFile; ?> ');
 	      $('import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error
+//]]>
 	      <?php  
 		// reload the left sidebar when the import is finished
 		$GLOBALS['reload']=true; 
 		PMA_reloadNavigation(true); 
 	      ?>
+//<![CDATA[
 	    } // if [finished==item]
 	  } // if [index==finished]    
 	  if (index=="percent")
@@ -135,6 +138,7 @@ if (empty($import_list)) {
 }); // if [load]
   document.write('<form action="import.php" method="post" enctype="multipart/form-data" name="import" <?php if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") echo 'target="import_upload_iframe"'; ?>>');
 -->
+//]]>
 </script>
 <noscript>
   <form action="import.php" method="post" enctype="multipart/form-data" name="import">
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index b37c9c6fd..faf8cc820 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -19,6 +19,7 @@ require_once './libraries/common.inc.php';
 if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
 ?>
 <script type="text/javascript">
+//<![CDATA[
 try {
     // can't access this if on a different domain
     var topdomain = top.document.domain;
@@ -32,6 +33,7 @@ catch(e) {
     alert("Redirecting... (error: " + e);
     top.location.replace(self.document.URL.substring(0, self.document.URL.lastIndexOf("/")+1));
 }
+//]]>
 </script>
 <?php
 }