From 6791cf874d0247b3a510e487eba5bb94e7d65190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 22 Feb 2010 15:46:06 +0000
Subject: [PATCH] Adjust themes to make them work with current head.

---
 aqua/css/theme_left.css.php          | 2 +-
 aqua/css/theme_right.css.php         | 2 +-
 aqua_brushed/css/theme_left.css.php  | 2 +-
 aqua_brushed/css/theme_right.css.php | 2 +-
 arctic_ocean/css/theme_left.css.php  | 2 +-
 arctic_ocean/css/theme_print.css.php | 4 ++--
 arctic_ocean/css/theme_right.css.php | 2 +-
 clearview3/css/theme_left.css.php    | 2 +-
 clearview3/css/theme_right.css.php   | 2 +-
 crimson_gray/css/theme_left.css.php  | 2 +-
 crimson_gray/css/theme_right.css.php | 2 +-
 grid/css/theme_left.css.php          | 4 ++--
 grid/css/theme_right.css.php         | 4 ++--
 hillside/css/theme_left.css.php      | 2 +-
 hillside/css/theme_right.css.php     | 2 +-
 paradice/css/theme_left.css.php      | 2 +-
 paradice/css/theme_right.css.php     | 2 +-
 xampp/css/theme_left.css.php         | 4 ++--
 xampp/css/theme_print.css.php        | 4 ++--
 xampp/css/theme_right.css.php        | 2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/aqua/css/theme_left.css.php b/aqua/css/theme_left.css.php
index 1b3a0ae7ca..6057f14b42 100644
--- a/aqua/css/theme_left.css.php
+++ b/aqua/css/theme_left.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+    font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
 }
 
 input, select, textarea {
diff --git a/aqua/css/theme_right.css.php b/aqua/css/theme_right.css.php
index f98cea6e41..70316d85d6 100644
--- a/aqua/css/theme_right.css.php
+++ b/aqua/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+    font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
 }
 
 input, select, textarea {
diff --git a/aqua_brushed/css/theme_left.css.php b/aqua_brushed/css/theme_left.css.php
index e90e0fc98e..a9a1c36c51 100644
--- a/aqua_brushed/css/theme_left.css.php
+++ b/aqua_brushed/css/theme_left.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+    font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
 }
 
 input, select, textarea {
diff --git a/aqua_brushed/css/theme_right.css.php b/aqua_brushed/css/theme_right.css.php
index 17eb3b590b..bdb107c90e 100644
--- a/aqua_brushed/css/theme_right.css.php
+++ b/aqua_brushed/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>;
+    font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
 }
 
 input, select, textarea {
diff --git a/arctic_ocean/css/theme_left.css.php b/arctic_ocean/css/theme_left.css.php
index 92820cafb1..98853f7a1f 100644
--- a/arctic_ocean/css/theme_left.css.php
+++ b/arctic_ocean/css/theme_left.css.php
@@ -23,7 +23,7 @@
 
     // 2007-08-24 (mkkeck)
     //            Get font-sizes
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     if (!empty($pma_fsize)) {
         $pma_fsize = ($pma_fsize * 0.01);
diff --git a/arctic_ocean/css/theme_print.css.php b/arctic_ocean/css/theme_print.css.php
index 4a7af4c513..1c070aa21d 100644
--- a/arctic_ocean/css/theme_print.css.php
+++ b/arctic_ocean/css/theme_print.css.php
@@ -8,7 +8,7 @@
  * @subpackage Arctic_Ocean
  */
 
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     $pma_fsize = @($pma_fsize / 100);
     if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -16,7 +16,7 @@
         $fsize     = ceil($usr_fsize * $pma_fsize)
                    . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
     } else
-        $fsize = $_SESSION['PMA_Config']->get('fontsize');
+        $fsize = $GLOBALS['PMA_Config']->get('fontsize');
 ?>
 html {
     font-size:           <?php echo $fsize; ?>;
diff --git a/arctic_ocean/css/theme_right.css.php b/arctic_ocean/css/theme_right.css.php
index a0b2ef20ff..ea2f273447 100644
--- a/arctic_ocean/css/theme_right.css.php
+++ b/arctic_ocean/css/theme_right.css.php
@@ -26,7 +26,7 @@
 
     // 2007-08-24 (mkkeck)
     //    Get font-sizes
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     if (!empty($pma_fsize)) {
         $pma_fsize = ($pma_fsize * 0.01);
diff --git a/clearview3/css/theme_left.css.php b/clearview3/css/theme_left.css.php
index 4351edf24f..60d809ab64 100644
--- a/clearview3/css/theme_left.css.php
+++ b/clearview3/css/theme_left.css.php
@@ -14,7 +14,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 }
 ?>
 
-body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
+body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
 input,
 select,
 textarea{font-size:1em;}
diff --git a/clearview3/css/theme_right.css.php b/clearview3/css/theme_right.css.php
index 84b09cfe57..9d5ef64970 100644
--- a/clearview3/css/theme_right.css.php
+++ b/clearview3/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general elements
 ********************************************************************** */
-html{font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>}
+html{font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>}
 body,
 body#bodyquerywindow{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;color:<?php echo $GLOBALS['cfg']['MainColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size:95%;line-height:130%}
 a img{border:none}
diff --git a/crimson_gray/css/theme_left.css.php b/crimson_gray/css/theme_left.css.php
index 227065bce9..4427e98281 100644
--- a/crimson_gray/css/theme_left.css.php
+++ b/crimson_gray/css/theme_left.css.php
@@ -15,7 +15,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
 }
 
 input, select, textarea {
diff --git a/crimson_gray/css/theme_right.css.php b/crimson_gray/css/theme_right.css.php
index a3eb70f822..dd586949a1 100644
--- a/crimson_gray/css/theme_right.css.php
+++ b/crimson_gray/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : (
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : (
         isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '84%'));?>;
 }
 
diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index aac5dde854..052387f64d 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -66,8 +66,8 @@ if (version_compare(PMA_VERSION, '3.0', 'ge')) {
     echo
     'html',
     _S, 'font-size:',_2;
-    if (null !== $_SESSION['PMA_Config']->get('fontsize')) {
-        echo $_SESSION['PMA_Config']->get('fontsize');
+    if (null !== $GLOBALS['PMA_Config']->get('fontsize')) {
+        echo $GLOBALS['PMA_Config']->get('fontsize');
         } elseif (!empty($_COOKIE['pma_fontsize'])) {
             echo $_COOKIE['pma_fontsize'];
             } else echo '82%';
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index 04efce2838..9bee7eff1d 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -72,8 +72,8 @@ if (version_compare(PMA_VERSION,'3.0','ge')) {
     echo
     'html',
     _S, 'font-size:', _2;
-    if (null !== $_SESSION['PMA_Config']->get('fontsize')) {
-        echo $_SESSION['PMA_Config']->get('fontsize');
+    if (null !== $GLOBALS['PMA_Config']->get('fontsize')) {
+        echo $GLOBALS['PMA_Config']->get('fontsize');
         } elseif (!empty($_COOKIE['pma_fontsize'])) {
             echo $_COOKIE['pma_fontsize'];
             } else echo '82%';
diff --git a/hillside/css/theme_left.css.php b/hillside/css/theme_left.css.php
index 781437be3d..2dc4cdfe28 100644
--- a/hillside/css/theme_left.css.php
+++ b/hillside/css/theme_left.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
 }
 
 input, select, textarea {
diff --git a/hillside/css/theme_right.css.php b/hillside/css/theme_right.css.php
index 705d7181bd..834b10cf42 100644
--- a/hillside/css/theme_right.css.php
+++ b/hillside/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
 }
 
 input, select, textarea {
diff --git a/paradice/css/theme_left.css.php b/paradice/css/theme_left.css.php
index f47e719830..f96c55e174 100644
--- a/paradice/css/theme_left.css.php
+++ b/paradice/css/theme_left.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
 }
 
 input, select, textarea {
diff --git a/paradice/css/theme_right.css.php b/paradice/css/theme_right.css.php
index 9b661ebdd0..a936fce6c9 100644
--- a/paradice/css/theme_right.css.php
+++ b/paradice/css/theme_right.css.php
@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
 /******************************************************************************/
 /* general tags */
 html {
-    font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
+    font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
 }
 
 input, select, textarea {
diff --git a/xampp/css/theme_left.css.php b/xampp/css/theme_left.css.php
index 5b6dfcdeaa..6134d4ddac 100644
--- a/xampp/css/theme_left.css.php
+++ b/xampp/css/theme_left.css.php
@@ -19,7 +19,7 @@
 
     $ipath = $_SESSION['PMA_Theme']->getImgPath();
 
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     $pma_fsize = @($pma_fsize / 100);
     if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -27,7 +27,7 @@
         $fsize     = ceil($usr_fsize * $pma_fsize) 
                    . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
     } else
-        $fsize = $_SESSION['PMA_Config']->get('fontsize');
+        $fsize = $GLOBALS['PMA_Config']->get('fontsize');
 ?>
 /******************************************************************************/
 /* general tags */
diff --git a/xampp/css/theme_print.css.php b/xampp/css/theme_print.css.php
index a17f4ac841..1d43dfeae5 100644
--- a/xampp/css/theme_print.css.php
+++ b/xampp/css/theme_print.css.php
@@ -8,7 +8,7 @@
  * @subpackage Arctic_Ocean
  */
 
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     $pma_fsize = @($pma_fsize / 100);
     if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -16,7 +16,7 @@
         $fsize     = ceil($usr_fsize * $pma_fsize)
                    . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
     } else
-        $fsize = $_SESSION['PMA_Config']->get('fontsize');
+        $fsize = $GLOBALS['PMA_Config']->get('fontsize');
 ?>
 html {
     font-size:           <?php echo $fsize; ?>;
diff --git a/xampp/css/theme_right.css.php b/xampp/css/theme_right.css.php
index c7908e5b26..4c9b937301 100644
--- a/xampp/css/theme_right.css.php
+++ b/xampp/css/theme_right.css.php
@@ -26,7 +26,7 @@
 
     // 2007-08-24 (mkkeck)
     //            Get font-sizes
-    $pma_fsize = $_SESSION['PMA_Config']->get('fontsize');
+    $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
     $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
     if (!empty($pma_fsize)) {
         $pma_fsize = ($pma_fsize * 0.01);