From 74ae9ab6d13beba625aac672911cd3b8f71b9810 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 10 Feb 2016 10:51:15 -0500 Subject: [PATCH 1/5] 4.6.0-alpha release Signed-off-by: Isaac Bennetch --- README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 62f6009f52..30a9e920a0 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.0-dev +Version 4.6.0-alpha A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index da5d5370ed..2ec3c0e7c7 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.6.0-dev' +version = '4.6.0-alpha' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index 1d9da81b21..aec1893fe8 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.0-dev'); + $this->set('PMA_VERSION', '4.6.0-alpha'); /** * @deprecated */ From a1316ede8fde5c522bd4e1dc339b63e3317f41f8 Mon Sep 17 00:00:00 2001 From: Rodrigo Moreira Date: Wed, 10 Feb 2016 16:52:01 +0100 Subject: [PATCH 2/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 91.5% (2944 of 3214 strings) [CI skip] --- po/pt_BR.po | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index ee6d954fbe..d981e8a62e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-08 09:38+0100\n" -"PO-Revision-Date: 2016-02-03 19:50+0000\n" -"Last-Translator: Pedro Moreira \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2016-02-10 16:51+0000\n" +"Last-Translator: Rodrigo Moreira \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -772,6 +772,9 @@ msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." msgstr "" +"A extensão curl não foi encontrada, sendo assim allow_url_fopen está " +"desabilitado. Devido a isto, alguns comportamentos tais como relatório de " +"erro ou verificação de versão estão desabilitadas." #: index.php:499 msgid "" @@ -1122,7 +1125,7 @@ msgstr "Fechar" #, fuzzy #| msgid "The number of pages created." msgid "Template was created." -msgstr "O número de páginas criadas." +msgstr "Template foi criado." #: js/messages.php:153 msgid "Template was loaded." @@ -1132,13 +1135,13 @@ msgstr "O template foi carregado." #, fuzzy #| msgid "The profile has been updated." msgid "Template was updated." -msgstr "O perfil foi atualizado." +msgstr "Template foi atualizado." #: js/messages.php:155 #, fuzzy #| msgid "The row has been deleted." msgid "Template was deleted." -msgstr "Registro eliminado." +msgstr "Template foi excluído." #. l10n: Other, small valued, queries #: js/messages.php:158 libraries/ServerStatusData.php:130 @@ -1709,7 +1712,6 @@ msgid "Formatting SQL…" msgstr "Formatando SQL…" #: js/messages.php:346 -#, fuzzy #| msgid "Bad parameters!" msgid "No parameters found!" msgstr "Parâmetros incorretos!" @@ -1740,10 +1742,9 @@ msgid "Loading…" msgstr "Carregando…" #: js/messages.php:358 -#, fuzzy #| msgid "Request Aborted!!" msgid "Request aborted!!" -msgstr "Pedido abortado!!" +msgstr "Requisição abortada!!" #: js/messages.php:359 #, fuzzy @@ -1752,10 +1753,9 @@ msgid "Processing request" msgstr "Processando a requisição" #: js/messages.php:360 -#, fuzzy #| msgid "Request Failed!!" msgid "Request failed!!" -msgstr "Pedido Falhou!!" +msgstr "Requisição falhou!!" #: js/messages.php:361 msgid "Error in processing request" @@ -1784,10 +1784,9 @@ msgid "Dropping column" msgstr "Excluindo coluna" #: js/messages.php:366 -#, fuzzy #| msgid "Add primary key" msgid "Adding primary key" -msgstr "Adicionar chave primária" +msgstr "Adicionando chave primária" #: js/messages.php:367 #: templates/database/designer/aggregate_query_panel.phtml:59 @@ -1804,22 +1803,19 @@ msgid "Click to dismiss this notification" msgstr "Clique para fechar este aviso" #: js/messages.php:371 -#, fuzzy #| msgid "Renaming Databases" msgid "Renaming databases" -msgstr "Renomeando o banco de dados" +msgstr "Renomeando banco de dados" #: js/messages.php:372 -#, fuzzy #| msgid "Copying Database" msgid "Copying database" msgstr "Copiando o banco de dados" #: js/messages.php:373 -#, fuzzy #| msgid "Changing Charset" msgid "Changing charset" -msgstr "Mudando o conjunto de caracteres" +msgstr "Alterando o conjunto de caracteres" #: js/messages.php:377 libraries/Util.php:3284 msgid "Enable foreign key checks" @@ -2215,10 +2211,9 @@ msgid "Inner ring" msgstr "Anel interno" #: js/messages.php:516 -#, fuzzy #| msgid "Outer ring:" msgid "Outer ring" -msgstr "Anel externo:" +msgstr "Anel externo" #: js/messages.php:520 msgid "Do you want to copy encryption key?" @@ -2479,7 +2474,6 @@ msgid "Show panel" msgstr "Mostrar painel" #: js/messages.php:632 -#, fuzzy #| msgid "Hide Panel" msgid "Hide panel" msgstr "Ocultar painel" @@ -2525,16 +2519,14 @@ msgid "Create view" msgstr "Criar view" #: js/messages.php:653 -#, fuzzy #| msgid "Send error reports" msgid "Send error report" msgstr "Enviar relatório de erros" #: js/messages.php:654 -#, fuzzy #| msgid "Submit Error Report" msgid "Submit error report" -msgstr "Cadastrar Relatório de Erro" +msgstr "Cadastrar relatório de erro" #: js/messages.php:656 msgid "" From d96dc09e99c8d05002cf955402e7733eb37ef378 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 10 Feb 2016 11:13:13 -0500 Subject: [PATCH 3/5] Correction for 4.6.0-alpha1 release Signed-off-by: Isaac Bennetch --- README | 2 +- doc/conf.py | 2 +- libraries/Config.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 30a9e920a0..fbae5a8947 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.0-alpha +Version 4.6.0-alpha1 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 2ec3c0e7c7..c65f080ec6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.6.0-alpha' +version = '4.6.0-alpha1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index aec1893fe8..b770c2fd59 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.0-alpha'); + $this->set('PMA_VERSION', '4.6.0-alpha1'); /** * @deprecated */ From c06ebed2f8f8b86822d5ca1de145615e6ff51cb4 Mon Sep 17 00:00:00 2001 From: Rodrigo Moreira Date: Wed, 10 Feb 2016 17:03:22 +0100 Subject: [PATCH 4/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.0% (2957 of 3214 strings) [CI skip] --- po/pt_BR.po | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d981e8a62e..222796f4e9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-08 09:38+0100\n" -"PO-Revision-Date: 2016-02-10 16:51+0000\n" +"PO-Revision-Date: 2016-02-10 17:03+0000\n" "Last-Translator: Rodrigo Moreira \n" "Language-Team: Portuguese (Brazil) " "\n" @@ -2537,16 +2537,14 @@ msgstr "" "erros?" #: js/messages.php:658 -#, fuzzy #| msgid "Change Report Settings" msgid "Change report settings" -msgstr "Alterar configurações de Relatórios" +msgstr "Alterar configurações de relatórios" #: js/messages.php:659 -#, fuzzy #| msgid "Show Report Details" msgid "Show report details" -msgstr "Exibir Detalhes de Relatório" +msgstr "Exibir detalhes de relatório" #: js/messages.php:662 msgid "" @@ -2601,7 +2599,7 @@ msgstr "" #, fuzzy, php-format #| msgid "Executed queries" msgid "%s queries executed %s times in %s seconds." -msgstr "Consultas executadas" +msgstr "%s consultas executadas %s vezes em %s segundos" #: js/messages.php:705 #, php-format @@ -2609,10 +2607,9 @@ msgid "%s argument(s) passed" msgstr "%s parâmetro(s) passado(s)" #: js/messages.php:706 -#, fuzzy #| msgid "Show table comments" msgid "Show arguments" -msgstr "Mostrar comentários da tabela" +msgstr "Mostrar comentários" #: js/messages.php:707 #, fuzzy @@ -2640,22 +2637,20 @@ msgstr "" "normalmente causado pelo \"Navegação Privada\"." #: js/messages.php:711 -#, fuzzy #| msgid "Copy database to" msgid "Copy tables to" -msgstr "Copiar banco de dados para" +msgstr "Copiar tabelas para" #: js/messages.php:712 -#, fuzzy #| msgid "Add table prefix:" msgid "Add table prefix" -msgstr "Adicionar prefixo de tabelas:" +msgstr "Adicionar prefixo de tabela" #: js/messages.php:713 #, fuzzy #| msgid "Replace table prefix" msgid "Replace table with prefix" -msgstr "Substituir o prefixo de tabelas" +msgstr "Substituir tabela com o prefixo" #: js/messages.php:714 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" @@ -2982,10 +2977,9 @@ msgid "Please enter a valid date or time" msgstr "Por favor, digite um data válida ou um tempo" #: js/messages.php:941 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid HEX input" -msgstr "Por favor, digite um número válido!" +msgstr "Por favor, digite um número HEXADECIMAL válido" #: js/messages.php:946 libraries/Message.php:200 libraries/Util.php:673 #: libraries/core.lib.php:245 libraries/import.lib.php:99 @@ -3205,72 +3199,65 @@ msgid "Press Enter to execute query" msgstr "Pressione Enter para executar consulta" #: libraries/Console.php:280 -#, fuzzy #| msgid "Ascending" msgid "ascending" -msgstr "Ascendente" +msgstr "ascendente" #: libraries/Console.php:283 -#, fuzzy #| msgid "Descending" msgid "descending" -msgstr "Descendente" +msgstr "descendente" #: libraries/Console.php:286 -#, fuzzy #| msgid "Order" msgid "Order:" -msgstr "Ordem" +msgstr "Ordem:" #: libraries/Console.php:292 templates/table/search/replace_preview.phtml:17 msgid "Count" msgstr "Contagem" #: libraries/Console.php:295 -#, fuzzy #| msgid "Execute every" msgid "Execution order" -msgstr "Executar sempre" +msgstr "Ordem de execução" #: libraries/Console.php:298 msgid "Time taken" msgstr "Tempo gasto" #: libraries/Console.php:301 -#, fuzzy #| msgid "Order" msgid "Order by:" -msgstr "Ordem" +msgstr "Ordenar por:" #: libraries/Console.php:304 #, fuzzy #| msgid "SQL queries" msgid "Group queries" -msgstr "Queries SQL" +msgstr "Agrupar consultas" #: libraries/Console.php:307 -#, fuzzy #| msgid "SQL queries" msgid "Ungroup queries" -msgstr "Queries SQL" +msgstr "Desagrupar consultas" #: libraries/Console.php:318 #, fuzzy #| msgid "Show create" msgid "Show trace" -msgstr "Mostrar create" +msgstr "Mostrar rastro" #: libraries/Console.php:320 #, fuzzy #| msgid "Hide Panel" msgid "Hide trace" -msgstr "Ocultar painel" +msgstr "Ocultar rastro" #: libraries/Console.php:322 -#, fuzzy #| msgid "Count" msgid "Count:" -msgstr "Contagem" +msgstr "Contagem:" #: libraries/Console.php:339 libraries/Util.php:1292 #: libraries/config/messages.inc.php:898 From 33718de82f2dda55a747c2aa3c7cd9e7bda2dfa9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 11 Feb 2016 10:54:36 +1100 Subject: [PATCH 5/5] Fix #11923 Errors on Structure tab when user only has select access on certain columns Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + .../table/TableStructureController.php | 31 +++---------------- .../table/structure/display_structure.phtml | 26 ++-------------- 3 files changed, 8 insertions(+), 50 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52e9da7620..8bfac5d127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ phpMyAdmin - ChangeLog - issue #11412 Remove PmaAbsoluteUri configuration directive - issue #11914 Fix autoloading of phpseclib - issue #11880 Fixed rendering of missing extension error +- issue #11923 Errors on Structure tab when user only has select access on certain columns 4.5.5.0 (not yet released) - issue Undefined index: is_ajax_request diff --git a/libraries/controllers/table/TableStructureController.php b/libraries/controllers/table/TableStructureController.php index e94d045b97..1510f7decb 100644 --- a/libraries/controllers/table/TableStructureController.php +++ b/libraries/controllers/table/TableStructureController.php @@ -349,32 +349,11 @@ class TableStructureController extends TableController $this->db, $this->table, null, true ); - // Get more complete field information - // For now, this is done just for MySQL 4.1.2+ new TIMESTAMP options - // but later, if the analyser returns more information, it - // could be executed for any MySQL version and replace - // the info given by SHOW FULL COLUMNS FROM. - // - // We also need this to correctly learn if a TIMESTAMP is NOT NULL, since - // SHOW FULL COLUMNS or INFORMATION_SCHEMA incorrectly says NULL - // and SHOW CREATE TABLE says NOT NULL (tested - // in MySQL 4.0.25 and 5.0.21, http://bugs.mysql.com/20910). - - $show_create_table = $this->table_obj->showCreate(); - $parser = new SqlParser\Parser($show_create_table); - - /** - * @var CreateStatement $stmt - */ - $stmt = $parser->statements[0]; - - $create_table_fields = SqlTable::getFields($stmt); - //display table structure $this->response->addHTML( $this->displayStructure( - $cfgRelation, $columns_with_unique_index, $url_params, $primary, - $fields, $columns_with_index, $create_table_fields + $cfgRelation, $columns_with_unique_index, $url_params, + $primary, $fields, $columns_with_index ) ); @@ -1167,13 +1146,12 @@ class TableStructureController extends TableController * no one exists * @param array $fields Fields * @param array $columns_with_index Columns with index - * @param array $create_table_fields Fields of the table. * * @return string */ protected function displayStructure( - $cfgRelation, $columns_with_unique_index, $url_params, $primary_index, - $fields, $columns_with_index, $create_table_fields + $cfgRelation, $columns_with_unique_index, $url_params, + $primary_index, $fields, $columns_with_index ) { /* TABLE INFORMATION */ $HideStructureActions = ''; @@ -1296,7 +1274,6 @@ class TableStructureController extends TableController 'fields' => $fields, 'columns_with_index' => $columns_with_index, 'central_list' => $central_list, - 'create_table_fields' => $create_table_fields, 'comments_map' => $comments_map ) ); diff --git a/templates/table/structure/display_structure.phtml b/templates/table/structure/display_structure.phtml index e97b3edd4a..ceece39f02 100644 --- a/templates/table/structure/display_structure.phtml +++ b/templates/table/structure/display_structure.phtml @@ -28,34 +28,14 @@ $rownum = 0; $odd_row = true; ?> NULL';