nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix output handling (bug #1450555).

Browse Source
This commit is contained in:
Michal Čihař
2006-03-15 19:36:22 +00:00
parent ab2a1160b7
commit b3bb99329e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2006-03-15 Michal Čihař <michal@cihar.com>
* libraries/export/htmlexcel.php: Fix output handling (bug #1450555).
2006-03-14 Michal Čihař <michal@cihar.com> 2006-03-14 Michal Čihař <michal@cihar.com>
* lang/czech: Update, use binary prefixes. * lang/czech: Update, use binary prefixes.
* lang/english: Nothing to translate here. * lang/english: Nothing to translate here.

14
libraries/export/htmlexcel.php
View File

@@ -25,12 +25,14 @@ function PMA_exportComment($text) {
* @access public * @access public
*/ */
function PMA_exportFooter() { function PMA_exportFooter() {
?> if (!PMA_exportOutputHandler('
</table> </table>
</div> </div>
</body> </body>
</html> </html>
<?php ')) {
return FALSE;
}
return TRUE; return TRUE;
} }
@@ -43,7 +45,7 @@ function PMA_exportFooter() {
*/ */
function PMA_exportHeader() { function PMA_exportHeader() {
global $charset, $charset_of_file; global $charset, $charset_of_file;
?> if (!PMA_exportOutputHandler('
<html xmlns:o="urn:schemas-microsoft-com:office:office" <html xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:x="urn:schemas-microsoft-com:office:excel"
xmlns="http://www.w3.org/TR/REC-html40"> xmlns="http://www.w3.org/TR/REC-html40">
@@ -60,8 +62,10 @@ xmlns="http://www.w3.org/TR/REC-html40">
<div id="Classeur1_16681" align=center x:publishsource="Excel"> <div id="Classeur1_16681" align=center x:publishsource="Excel">
<table x:str border=0 cellpadding=0 cellspacing=0 width=100% style='border-collapse: collapse'> <table x:str border=0 cellpadding=0 cellspacing=0 width=100% style="border-collapse: collapse">
<?php ')) {
return FALSE;
}
return TRUE; return TRUE;
} }