From 91ae7b67bd09d175d840fc9374fcd8d0bcf99448 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 16 Aug 2008 12:17:52 +0000
Subject: [PATCH] various code improvements, thanks to Piotr Przybylski

---
 export.php                 | 4 ++--
 libraries/Config.class.php | 2 +-
 libraries/import.lib.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/export.php b/export.php
index e23d98615..7caff0d3d 100644
--- a/export.php
+++ b/export.php
@@ -211,8 +211,8 @@ $output_charset_conversion = $asfile &&
     && isset($charset_of_file) && $charset_of_file != $charset
     && $type != 'xls';
 
-// Use on fly compression?
-$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' | $compression == 'bzip');
+// Use on the fly compression?
+$onfly_compression = $GLOBALS['cfg']['CompressOnFly'] && ($compression == 'gzip' || $compression == 'bzip');
 if ($onfly_compression) {
     $memory_limit = trim(@ini_get('memory_limit'));
     // 2 MB as default
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index d21ac8cee..39a79eaec 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -541,7 +541,7 @@ class PMA_Config
      */
     function getThemeUniqueValue()
     {
-        return intval((null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize'])) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info) . (isset($_SESSION['userconf']['custom_color']) ? substr($_SESSION['userconf']['custom_color'],1,6) : '');
+        return intval((null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : (isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : 0))) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info) . (isset($_SESSION['userconf']['custom_color']) ? substr($_SESSION['userconf']['custom_color'],1,6) : '');
     }
 
     /**
diff --git a/libraries/import.lib.php b/libraries/import.lib.php
index 1344e7fec..7d9a10232 100644
--- a/libraries/import.lib.php
+++ b/libraries/import.lib.php
@@ -82,7 +82,7 @@ function PMA_detectCompression($filepath)
 function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
 {
     global $import_run_buffer, $go_sql, $complete_query, $display_query,
-        $sql_query, $cfg, $my_die, $error, $reload, $timeout_passed,
+        $sql_query, $my_die, $error, $reload, 
         $skip_queries, $executed_queries, $max_sql_len, $read_multiply,
         $cfg, $sql_query_disabled, $db, $run_query, $is_superuser;
     $read_multiply = 1;