[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11708-g4a80c3e

[Michal Čihař]

The branch, master has been updated
       via  4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit)
       via  54398f8a124702e30820bc4636040dda1db6b71b (commit)
      from  c8967b62309eb6df7042fd44848042cd7f9d8d40 (commit)


- Log -----------------------------------------------------------------
commit 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1
Merge: c8967b62309eb6df7042fd44848042cd7f9d8d40 54398f8a124702e30820bc4636040dda1db6b71b
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Jul 22 15:17:25 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

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

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

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 9e02c24..af5dc89 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2078,7 +2078,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
       || $analyzed_sql[0]['where_clause'] == '1 ')) {
         // "j u s t   b r o w s i n g"
         $pre_count = '~';
-        $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a at ./Documentation.html#faq3_11 at Documentation]FAQ 3.11[/a]')), true);
+        $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a at ./Documentation.html#faq3_11 at Documentation]FAQ 3.11[/a]')));
     } else {
         $pre_count = '';
         $after_count = '';


hooks/post-receive
-- 
phpMyAdmin