From 2e0f8f1bfa98249c985f41bb41492a177fc2c8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 28 Apr 2006 08:52:25 +0000
Subject: [PATCH] Use correct charset.

---
 ChangeLog                | 1 +
 libraries/export/ods.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1092bd5b0..a65a6b092 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $Source$
       Customizable link under left logo (RFE #1111599).
     * libraries/export/htmlword.php: Fix including column names.
     * libraries/export/latex.php: Add missing crlf, remove unused code.
+    * libraries/export/ods.php: Use correct charset.
 
 2006-04-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * db_printview.php: fixed bug 'no tables found', refactored
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index d36ac3f61..75a747368 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -60,7 +60,7 @@ function PMA_exportFooter() {
  * @access  public
  */
 function PMA_exportHeader() {
-    $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="UTF-8"?' . '>'
+    $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?' . '>'
         . '<office:document-content '
             . 'xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" '
             . 'xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" '