[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19185-g8373e5f

[Madhura Jayaratne]

The branch, master has been updated
       via  8373e5feec2232e6a17b342eb0bf74930431bfcc (commit)
      from  3e37bf159d2f065745d765ae009c5989fd6dc6bf (commit)


- Log -----------------------------------------------------------------
commit 8373e5feec2232e6a17b342eb0bf74930431bfcc
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Sep 18 16:59:03 2011 +0530

    Removed redundant function

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

Summary of changes:
 libraries/tbl_select.lib.php |   25 -------------------------
 tbl_select.php               |    2 +-
 tbl_zoom_select.php          |    2 +-
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 53ffcb7..2fa598b 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -9,31 +9,6 @@
 require_once 'url_generating.lib.php';
 
 /**
- * Sets the title for foreign keys display link.
- *
- * @param mixed  $propertiesIconic Type of icon property
- * @param string $pmaThemeImage    Icon Image
- *
- * @return string $str Value of the Title
- */
-function PMA_tbl_setTitle($propertiesIconic, $pmaThemeImage)
-{
-    if ($propertiesIconic == true) {
-        $str = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
-            .'b_browse.png" alt="' . __('Browse foreign values') . '" title="'
-            . __('Browse foreign values') . '" />';
-
-        if ($propertiesIconic === 'both') {
-            $str .= __('Browse foreign values');
-        }
-
-        return $str;
-    } else {
-        return __('Browse foreign values');
-    }
-}
-
-/**
  * Gets all the fields of a table along with their types, collations
  * and whether null or not.
  *
diff --git a/tbl_select.php b/tbl_select.php
index 0ad5d25..6a2a5e4 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -25,7 +25,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
 
-$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
+$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'));
 
 $geom_types = PMA_getGISDatatypes();
 /**
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 7fabd2f..7d803c6 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -55,7 +55,7 @@ if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) {
     PMA_ajaxResponse(null, true, $extra_data);
 }
 
-$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
+$titles['Browse'] = PMA_getIcon('b_browse.png', __('Browse'));
 /**
  * Not selection yet required -> displays the selection form
  */


hooks/post-receive
-- 
phpMyAdmin