The branch, master has been updated via 8cd155d2e31d13d32f2779d15f7b39265657c50a (commit) via 8cebaca19b08f8faa5eaebfdb2d87c466f274db8 (commit) via c4c8fcb2b5fbf88fbe6dbcc987fd104d060eac4d (commit) via 36cb783d8dd2ab378fc60be549f1f696ea1b5df9 (commit) via d6057b37f38a9b20b8db78f7d1c08a188028c1a8 (commit) via 1cbbeecd8ff21f0e5b772d1983cfad1b0fab01b7 (commit) via 574a7d75c960b6fd195e67f89ca57657d2b02811 (commit) from ca6f3b0ac27ab2124c196dda8484397d99656e0b (commit)
- Log ----------------------------------------------------------------- commit 8cd155d2e31d13d32f2779d15f7b39265657c50a Merge: 36cb783d8dd2ab378fc60be549f1f696ea1b5df9 8cebaca19b08f8faa5eaebfdb2d87c466f274db8 Author: Michal Čihař mcihar@novell.com Date: Tue Jun 14 09:16:28 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit 36cb783d8dd2ab378fc60be549f1f696ea1b5df9 Author: stoyanster stoyanster@gmail.com Date: Tue Jun 14 08:31:41 2011 +0200
Translation update done using Pootle.
commit d6057b37f38a9b20b8db78f7d1c08a188028c1a8 Author: stoyanster stoyanster@gmail.com Date: Tue Jun 14 08:26:43 2011 +0200
Translation update done using Pootle.
commit 1cbbeecd8ff21f0e5b772d1983cfad1b0fab01b7 Author: stoyanster stoyanster@gmail.com Date: Tue Jun 14 08:23:43 2011 +0200
Translation update done using Pootle.
commit 574a7d75c960b6fd195e67f89ca57657d2b02811 Author: stoyanster stoyanster@gmail.com Date: Tue Jun 14 08:23:18 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + db_search.php | 2 +- po/bg.po | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 288e572..60b046b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ - patch #3311539 [edit] Inline edit does not escape backslashes - bug #3313210 [interface] Columns class sometimes changed for nothing - patch #3313326 [interface] Some tooltips do not disappear +- bug #3315720 [search] Fix search in non unicode tables
3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/db_search.php b/db_search.php index fba68d1..d93fd74 100644 --- a/db_search.php +++ b/db_search.php @@ -178,7 +178,7 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = PMA_backquote($tblfield) + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word diff --git a/po/bg.po b/po/bg.po index e7c05b1..7f68cfd 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-13 13:46+0200\n" +"PO-Revision-Date: 2011-06-14 08:31+0200\n" "Last-Translator: stoyanster@gmail.com\n" "Language-Team: bulgarian bg@li.org\n" "Language: bg\n" @@ -1609,16 +1609,14 @@ msgid "Could not save recent table" msgstr "Конфигурацията не може да бъде запазена"
#: libraries/RecentTable.class.php:148 -#, fuzzy #| msgid "Count tables" msgid "Recent tables" -msgstr "Брой таблици" +msgstr "Отваряни таблици"
#: libraries/RecentTable.class.php:154 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no recent tables" -msgstr "Няма файлве за качване" +msgstr "Няма наскоро отваряни таблици"
#: libraries/StorageEngine.class.php:194 msgid "" @@ -6681,6 +6679,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Вашите настройки ще бъдат пазени само за текущата сесия. За да ги използвате " +"постоянно е необходимо %sконфигурационно хранилище%s."
#: libraries/user_preferences.lib.php:142 msgid "Could not save configuration"
hooks/post-receive
-
Michal Čihař