From 54a059449321d7796cb59a920178f9c4c8031549 Mon Sep 17 00:00:00 2001 From: Renan Souza do Nascimento Date: Wed, 24 Aug 2016 23:16:44 +0000 Subject: [PATCH 1/2] Translated using Weblate (Portuguese) Currently translated at 53.7% (1724 of 3206 strings) [CI skip] --- po/pt.po | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/po/pt.po b/po/pt.po index c6297ebe52..98d20038a3 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-07-11 18:05+0000\n" -"Last-Translator: José Camilo Fernandes Coelho \n" -"Language-Team: Portuguese \n" +"PO-Revision-Date: 2016-08-24 23:16+0000\n" +"Last-Translator: Renan Souza do Nascimento \n" +"Language-Team: Portuguese " +"\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -804,7 +804,7 @@ msgstr "" #: index.php:525 msgid "The secret passphrase in configuration (blowfish_secret) is too short." -msgstr "" +msgstr "A chave privada para encriptação (blowfish_secret) é muito curta." #: index.php:539 msgid "" @@ -1013,6 +1013,8 @@ msgid "" "Are you sure you wish to change all the column collations and convert the " "data?" msgstr "" +"Você tem certeza que quer mudar todos os agrupamento de colunas e converter " +"os dados?" #: js/messages.php:111 msgid "Save & close" @@ -1945,7 +1947,7 @@ msgstr "Visualizar valores estrangeiros" #: js/messages.php:413 msgid "No auto-saved query" -msgstr "" +msgstr "Nenhuma consulta salva automaticamente" #: js/messages.php:414 #, php-format From fb3b722da1ae7e87aed06d4868a0dc63d6025dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 25 Aug 2016 09:36:38 +0200 Subject: [PATCH 2/2] Fixed random logouts due to wrong cookie path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some script did not properly configure their relative path and this could lead to wrong cookie path being set. This doesn't happen in all cases as the PHP session engine doesn't seem to set the cookie session in every request. Fixes #12251 Fixes phpmyadmin/docker#32 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/get_image.js.php | 1 + js/get_scripts.js.php | 1 + js/whitelist.php | 1 + 4 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 76f92845f1..c1e58bfb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #12479 Simplified validation of external links - issue #12483 Fix browsing tables with built in transformations - issue #12485 Do not show warning about short blowfish_secret if none is set +- issue #12251 Fixed random logouts due to wrong cookie path 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29 diff --git a/js/get_image.js.php b/js/get_image.js.php index 0c475d79d0..6c74deb9c8 100644 --- a/js/get_image.js.php +++ b/js/get_image.js.php @@ -15,6 +15,7 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); // Avoid loading the full common.inc.php because this would add many // non-js-compatible stuff like DOCTYPE define('PMA_MINIMUM_COMMON', true); +define('PMA_PATH_TO_BASEDIR', '../'); require_once './libraries/common.inc.php'; $buffer = PMA\libraries\OutputBuffering::getInstance(); diff --git a/js/get_scripts.js.php b/js/get_scripts.js.php index 06705c5d4e..fe2f8a295a 100644 --- a/js/get_scripts.js.php +++ b/js/get_scripts.js.php @@ -24,6 +24,7 @@ $_GET['scripts'] = json_encode($_GET['scripts']); // Avoid loading the full common.inc.php because this would add many // non-js-compatible stuff like DOCTYPE define('PMA_MINIMUM_COMMON', true); +define('PMA_PATH_TO_BASEDIR', '../'); require_once './libraries/common.inc.php'; $buffer = PMA\libraries\OutputBuffering::getInstance(); diff --git a/js/whitelist.php b/js/whitelist.php index 8abd360bb6..9c3da3e207 100644 --- a/js/whitelist.php +++ b/js/whitelist.php @@ -18,6 +18,7 @@ header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 3600) . ' GMT'); // Avoid loading the full common.inc.php because this would add many // non-js-compatible stuff like DOCTYPE define('PMA_MINIMUM_COMMON', true); +define('PMA_PATH_TO_BASEDIR', '../'); require_once './libraries/common.inc.php'; // Close session early as we won't write anything there session_write_close();