The branch, master has been updated
via 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1 (commit)
via 54398f8a124702e30820bc4636040dda1db6b71b (commit)
from c8967b62309eb6df7042fd44848042cd7f9d8d40 (commit)
- Log -----------------------------------------------------------------
commit 4a80c3e62d070d18ce12cc9bcf29d753e3eecef1
Merge: c8967b62309eb6df7042fd44848042cd7f9d8d40
54398f8a124702e30820bc4636040dda1db6b71b
Author: Michal Čihař <[email protected]>
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@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true);
+ $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See
[a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')));
} else {
$pre_count = '';
$after_count = '';
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
