[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19899-g3cbc022

[Rouslan Placella]

The branch, master has been updated
       via  3cbc022058c384cdc0327405ef4ebac8df94fbe4 (commit)
      from  a827abba17758d10b3d8216baf5bb23dc8dbdfbf (commit)


- Log -----------------------------------------------------------------
commit 3cbc022058c384cdc0327405ef4ebac8df94fbe4
Author: Rouslan Placella <rouslan at placella.com>
Date:   Fri Sep 23 19:15:17 2011 +0100

    Use the fallback in PMA_toggleButton(), if the theme is missing the graphics for it

-----------------------------------------------------------------------

Summary of changes:
 libraries/common.lib.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index b648ccf..1236667 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2637,7 +2637,7 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
     }
     // Generate output
     $retval  = "<!-- TOGGLE START -->\n";
-    if ($GLOBALS['cfg']['AjaxEnable']) {
+    if ($GLOBALS['cfg']['AjaxEnable'] && is_readable($_SESSION['PMA_Theme']->getImgPath() . 'toggle-ltr.png')) {
         $retval .= "<noscript>\n";
     }
     $retval .= "<div class='wrapper'>\n";
@@ -2653,7 +2653,7 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
     $retval .= "        <input type='submit' value='" . __('Change') . "'/>\n";
     $retval .= "    </form>\n";
     $retval .= "</div>\n";
-    if ($GLOBALS['cfg']['AjaxEnable']) {
+    if ($GLOBALS['cfg']['AjaxEnable'] && is_readable($_SESSION['PMA_Theme']->getImgPath() . 'toggle-ltr.png')) {
         $retval .= "</noscript>\n";
         $retval .= "<div class='wrapper toggleAjax hide'>\n";
         $retval .= "    <div class='toggleButton'>\n";


hooks/post-receive
-- 
phpMyAdmin