[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-841-g019b9de

[Marc Delisle]

The branch, master has been updated
       via  019b9de9dae1f85509165e57830f1313ca5078d4 (commit)
       via  9948d179ba2412c3f00031bc34e4bc63b01689f8 (commit)
      from  2f37e3cb5da1aa8c294b4544b49ee9fbd55d0743 (commit)


- Log -----------------------------------------------------------------
commit 019b9de9dae1f85509165e57830f1313ca5078d4
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Feb 22 07:48:47 2011 -0500

    For proper conversion of the Edit link to Inline Edit

commit 9948d179ba2412c3f00031bc34e4bc63b01689f8
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Feb 22 07:46:33 2011 -0500

    Inline edit link not generated when PropertiesIconic is false

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

Summary of changes:
 js/sql.js                |   12 ++++++++----
 libraries/common.lib.php |    9 +++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 0132a8c..96ebf2c 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -69,8 +69,10 @@ function appendInlineAnchor() {
             var $cloned_tr = $this_tr.clone();
 
             var $img_object = $cloned_tr.find('img:first').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_tr.find('td')
              .addClass('inline_edit_anchor')
@@ -98,8 +100,10 @@ function appendInlineAnchor() {
             var $cloned_anchor = $this_td.clone();
 
             var $img_object = $cloned_anchor.find('img').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.addClass('inline_edit_anchor')
             .find('a').attr('href', '#')
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a4c6a71..f132e75 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -101,9 +101,8 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
         $include_box = true;
     }
 
-    if ($include_box) {
-        $button .= '<span class="nowrap">';
-    }
+    // Always use a span (we rely on this in js/sql.js)
+    $button .= '<span class="nowrap">';
 
     if ($include_icon) {
         $button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"'
@@ -119,9 +118,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
         $button .= $alternate;
     }
 
-    if ($include_box) {
-        $button .= '</span>';
-    }
+    $button .= '</span>';
 
     return $button;
 }


hooks/post-receive
-- 
phpMyAdmin