From 1adcde76d095d0b8e73def4145f3026f8a5fa596 Mon Sep 17 00:00:00 2001 From: Victor Volkov Date: Fri, 29 Jun 2012 18:49:23 +0200 Subject: [PATCH 1/6] Translated using Weblate. --- po/ru.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index a866518d2b..4fd140bd1d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-26 20:04+0200\n" +"PO-Revision-Date: 2012-06-29 18:49+0200\n" "Last-Translator: Victor Volkov \n" "Language-Team: russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Weblate 1.0\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -7981,7 +7981,6 @@ msgstr "" "строки." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -8008,13 +8007,14 @@ msgstr "" "ТОЛЬКО LINUX: Запускает внешнее приложение и подает ему на ввод данные поля. " "Возвращает обычный вывод приложения. По умолчанию используется Tidy " "(форматирование HTML-кода). По соображениям безопасности, необходимо вручную " -"отредактировать файл libraries/transformations/text_plain__external.inc.php " -"вписав доступные программы. Первый параметр задает номер используемой " -"программы, во втором параметре передаются параметры собственно программы. " -"При установке третьего параметра в 1, данные вывода будут преобразованы " -"функцией PHP htmlspecialchars() (по умолчанию: 1). Установка червертого " -"параметра в 1, предотвратит переносы строки и выведет данные в одну строку " -"(по умолчанию: 1)." +"отредактировать файл " +"libraries/plugins/transformations/Text_Plain_External.class.php вписав " +"доступные программы. Первый параметр задает номер используемой программы, во " +"втором параметре передаются параметры собственно программы. При установке " +"третьего параметра в 1, данные вывода будут преобразованы функцией PHP " +"htmlspecialchars() (по умолчанию: 1). Установка четвертого параметра в 1, " +"предотвратит переносы строки и выведет данные в одну строку (по умолчанию: " +"1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" From ada8b0e80a21b468e1fec8cb4a96894c99ce1143 Mon Sep 17 00:00:00 2001 From: Domen Date: Fri, 29 Jun 2012 18:51:08 +0200 Subject: [PATCH 2/6] Translated using Weblate. --- po/sl.po | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/po/sl.po b/po/sl.po index 3124db900d..770e09be3a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-28 09:04+0200\n" -"PO-Revision-Date: 2012-06-26 22:56+0200\n" +"PO-Revision-Date: 2012-06-29 18:51+0200\n" "Last-Translator: Domen \n" "Language-Team: slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" -"X-Generator: Weblate 1.0\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" +"X-Generator: Weblate 1.1\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:354 #: libraries/DisplayResults.class.php:577 server_privileges.php:1838 @@ -7928,7 +7928,6 @@ msgstr "" "možnost prazna." #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 -#, fuzzy #| msgid "" #| "LINUX ONLY: Launches an external application and feeds it the column data " #| "via standard input. Returns the standard output of the application. The " @@ -7952,15 +7951,15 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"SAMO ZA LINUX: Zažene zunanjo aplikacijo in podaja podatke stopcev preko " +"SAMO ZA LINUX: Zažene zunanjo aplikacijo in podaja podatke stopcev prek " "standardnega vhoda. Vrne standardni izhod aplikacije. Privzeto je Tidy, za " -"tiskanje HTML-kode. Zaradi varnostnih razlogov morate ročno urediti datoteko " -"libraries/transformations/text_plain__external.inc.php in vstaviti orodja za " -"zaganjanje. Prva možnost je številka programa, ki ga želite uporabiti, druga " -"možnost pa so parametri za program. Če tretji parameter nastavite na 1, bo s " -"pomočjo htmlspecialchars() pretvoril izhod (Privzeto 1). Če nastavite četrti " -"parameter na 1, bi preprečil prelamljanje in zagotovil, da se celotni izhod " -"prikaže v eni vrstici (Privzeto 1)." +"lep izpis kode HTML. Zaradi varnostnih razlogov morate ročno urediti " +"datoteko libraries/plugins/transformations/Text_Plain_External.class.php in " +"navesti orodja, ki jih želite omogočiti. Prva možnost je številka programa, " +"ki ga želite uporabiti, druga možnost pa so parametri programa. Če tretji " +"parameter nastavite na 1, bo s pomočjo htmlspecialchars() pretvoril izhod " +"(Privzeto 1). Če nastavite četrti parameter na 1, bo preprečil prelamljanje " +"in zagotovil, da se celotni izhod prikaže v eni vrstici (Privzeto 1)." #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" From ee8692e9802c24e55ae28e37ad3ca535c93515d5 Mon Sep 17 00:00:00 2001 From: Alex Marin Date: Sat, 30 Jun 2012 13:00:48 +0300 Subject: [PATCH 3/6] fix strpos called on object --- libraries/DisplayResults.class.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index c4eb12fea0..427987e2f2 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -2506,7 +2506,7 @@ class PMA_DisplayResults * * @return array 5 element array - $edit_url, $copy_url, * $edit_str, $copy_str, $edit_anchor_class - * + * * @access private * * @see _getTableBody() @@ -2558,7 +2558,7 @@ class PMA_DisplayResults * * @return array 4 element array - $del_query, * $del_url, $del_str, $js_conf - * + * * @access private * * @see _getTableBody() @@ -3069,7 +3069,8 @@ class PMA_DisplayResults // (unless it's a link-type transformation) if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars'] && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT) - && ! strpos($transformation_plugin, 'Link') === true + && gettype($transformation_plugin) == "object" + && ! strpos($transformation_plugin::getName(), 'Link') === true ) { $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars']) . '...'; @@ -3326,7 +3327,7 @@ class PMA_DisplayResults * @param string $operation edit/copy/delete * * @return string $links_html html content - * + * * @access private * * @see _getVerticalTable() @@ -4508,7 +4509,9 @@ class PMA_DisplayResults $result .= ']'; - if (strpos($transformation_plugin, 'Octetstream')) { + if (gettype($transformation_plugin) == "object" + && strpos($transformation_plugin::getMIMESubtype(), 'Octetstream') + ) { $result = $content; } From 6d93aad72bf0345b935e1551b71ec0514ec7c801 Mon Sep 17 00:00:00 2001 From: Thilina Buddika Date: Sat, 30 Jun 2012 14:05:32 +0530 Subject: [PATCH 4/6] rplace use of PMA_showMessage with PMA_getMessage in insert_edit-lib and tbl_change --- libraries/insert_edit.lib.php | 2 +- tbl_change.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index c6d94b441e..823ff37251 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -140,7 +140,7 @@ function PMA_showEmptyResultMessageOrSetUniqueCondition($rows, $key_id, // No row returned if (! $rows[$key_id]) { unset($rows[$key_id], $where_clause_array[$key_id]); - PMA_showMessage( + echo PMA_getMessage( __('MySQL returned an empty result set (i.e. zero rows).'), $local_query ); diff --git a/tbl_change.php b/tbl_change.php index cbea2058cb..a33b438601 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -126,7 +126,7 @@ if (! empty($disp_message)) { if (! isset($disp_query)) { $disp_query = null; } - PMA_showMessage($disp_message, $disp_query); + echo PMA_getMessage($disp_message, $disp_query); } /** From a83f42eaa6619b8351ff67bbe528098415d53644 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 30 Jun 2012 07:39:23 -0400 Subject: [PATCH 5/6] The INSERT statement generated when we insert and choose "and then insert another new row" was not displayed --- tbl_change.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_change.php b/tbl_change.php index a33b438601..319b1b6742 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -126,7 +126,7 @@ if (! empty($disp_message)) { if (! isset($disp_query)) { $disp_query = null; } - echo PMA_getMessage($disp_message, $disp_query); + $response->addHTML(PMA_getMessage($disp_message, $disp_query)); } /** From 5dc0f782f501ed011a918483e4e69085bff722b0 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Sat, 30 Jun 2012 15:20:19 +0200 Subject: [PATCH 6/6] Fix PHP 5.4 upload progress working only with session.upload_progress.cleanup set to Off --- import_status.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/import_status.php b/import_status.php index d056c3e1d4..4e06ca4103 100644 --- a/import_status.php +++ b/import_status.php @@ -25,12 +25,12 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=') ) { $sessionupload = array(); - $prefix = ini_get('session.upload_progress.prefix'); + define('UPLOAD_PREFIX', ini_get('session.upload_progress.prefix')); session_start(); foreach ($_SESSION as $key => $value) { // only copy session-prefixed data - if (substr($key, 0, strlen($prefix)) == $prefix) { + if (substr($key, 0, strlen(UPLOAD_PREFIX)) == UPLOAD_PREFIX) { $sessionupload[$key] = $value; } } @@ -54,6 +54,15 @@ if (defined('SESSIONUPLOAD')) { foreach ($sessionupload as $key => $value) { $_SESSION[$key] = $value; } + + // remove session upload data that are not set anymore + foreach ($_SESSION as $key => $value) { + if (substr($key, 0, strlen(UPLOAD_PREFIX)) == UPLOAD_PREFIX + && ! isset($sessionupload[$key]) + ) { + unset($_SESSION[$key]); + } + } } /**