Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@atul516
atul516 committed Jun 30, 2012
2 parents 9281d8b + 5dc0f78 commit 9e5201e
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 34 deletions.
13 changes: 11 additions & 2 deletions import_status.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
) {

$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;
}
}
Expand All @@ -54,6 +54,15 @@
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]);
}
}
}

/**
Expand Down
13 changes: 8 additions & 5 deletions libraries/DisplayResults.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2506,7 +2506,7 @@ private function _getVerticalDisplaySupportSegments(
*
* @return array 5 element array - $edit_url, $copy_url,
* $edit_str, $copy_str, $edit_anchor_class
*
*
* @access private
*
* @see _getTableBody()
Expand Down Expand Up @@ -2558,7 +2558,7 @@ private function _getModifiedLinks(
*
* @return array 4 element array - $del_query,
* $del_url, $del_str, $js_conf
*
*
* @access private
*
* @see _getTableBody()
Expand Down Expand Up @@ -3069,7 +3069,8 @@ private function _getDataCellForNonNumericAndNonBlobColumns(
// (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'])
. '...';
Expand Down Expand Up @@ -3326,7 +3327,7 @@ private function _getVerticalTable()
* @param string $operation edit/copy/delete
*
* @return string $links_html html content
*
*
* @access private
*
* @see _getVerticalTable()
Expand Down Expand Up @@ -4508,7 +4509,9 @@ private function _handleNonPrintableContents(

$result .= ']';

if (strpos($transformation_plugin, 'Octetstream')) {
if (gettype($transformation_plugin) == "object"
&& strpos($transformation_plugin::getMIMESubtype(), 'Octetstream')
) {
$result = $content;
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/insert_edit.lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down
24 changes: 12 additions & 12 deletions po/ru.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hanut@php-myadmin.ru>\n"
"Language-Team: russian <ru@li.org>\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
Expand Down Expand Up @@ -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 "
Expand All @@ -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 ""
Expand Down
25 changes: 12 additions & 13 deletions po/sl.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\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
Expand Down Expand Up @@ -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 "
Expand All @@ -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 ""
Expand Down
2 changes: 1 addition & 1 deletion tbl_change.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
if (! isset($disp_query)) {
$disp_query = null;
}
PMA_showMessage($disp_message, $disp_query);
$response->addHTML(PMA_getMessage($disp_message, $disp_query));
}

/**
Expand Down

0 comments on commit 9e5201e

Please sign in to comment.