[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-168-g53e1178

[Madhura Jayaratne]

The branch, master has been updated
       via  53e11786b4284130308e46b0bf792a95375bbd87 (commit)
       via  8bad4aea1e1046661a13e8f05acd4a2fab6fd32a (commit)
      from  5f4a8e6a971e88135380a79ae09dc7ebd28010fb (commit)


- Log -----------------------------------------------------------------
commit 53e11786b4284130308e46b0bf792a95375bbd87
Merge: 5f4a8e6a971e88135380a79ae09dc7ebd28010fb 8bad4aea1e1046661a13e8f05acd4a2fab6fd32a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun May 15 21:22:10 2011 +0530

    Merge branch 'QA_3_4'

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

Summary of changes:
 js/sql.js |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index bd068cf..1872e12 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -118,10 +118,16 @@ function appendInlineAnchor() {
                  .first()
                  .prepend($img_object);
             } else {
+                // Only text is displayed. See $cfg['PropertiesIconic']
+                $cloned_anchor.find('a').attr('href', '#');
+                $cloned_anchor.find('a span').text(PMA_messages['strInlineEdit']);
+
                 // the link was too big so <input type="image"> is there
                 $img_object = $cloned_anchor.find('input:image').attr('title', PMA_messages['strInlineEdit']);
-                var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
-                $img_object.attr('src', img_src);
+                if ($img_object.length > 0) {
+                    var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
+                    $img_object.attr('src', img_src);
+                }
                 $cloned_anchor
                  .find('.clickprevimage')
                  .text(' ' + PMA_messages['strInlineEdit']);


hooks/post-receive
-- 
phpMyAdmin