gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-10-13 12:25:17 +05:30
commit 044bc4f0f1
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/Table.class.php
View File

@ -267,7 +267,9 @@ class PMA_Table
}
} else {
$show_create_table = $GLOBALS['dbi']->fetchValue(
'SHOW CREATE TABLE ' . PMA_Util::backquote($db) . '.' . PMA_Util::backquote($table),
'SHOW CREATE TABLE '
. PMA_Util::backquote($db)
. '.' . PMA_Util::backquote($table),
0,
1
);
@ -487,7 +489,8 @@ class PMA_Table
. PMA_Util::sqlAddSlashes($default_value) . '\'';
}
} else {
$query .= ' DEFAULT \'' . PMA_Util::sqlAddSlashes($default_value) . '\'';
$query .= ' DEFAULT \''
. PMA_Util::sqlAddSlashes($default_value) . '\'';
}
break;
case 'NULL' :
@ -739,12 +742,13 @@ class PMA_Table
$new_table_query = 'INSERT IGNORE INTO '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_Util::backquote($GLOBALS['cfgRelation'][$pma_table]) . '
(' . implode(', ', $select_parts) . ',
' . implode(', ', $new_parts) . ')
VALUES
(\'' . implode('\', \'', $value_parts) . '\',
\'' . implode('\', \'', $new_value_parts) . '\')';
. '.'
. PMA_Util::backquote($GLOBALS['cfgRelation'][$pma_table])
. ' (' . implode(', ', $select_parts)
. ', ' . implode(', ', $new_parts)
. ') VALUES (\''
. implode('\', \'', $value_parts) . '\', \''
. implode('\', \'', $new_value_parts) . '\')';
PMA_queryAsControlUser($new_table_query);
$last_id = $GLOBALS['dbi']->insertId();
@ -1038,13 +1042,19 @@ class PMA_Table
// Get all comments and MIME-Types for current table
$comments_copy_rs = PMA_queryAsControlUser(
'SELECT column_name, comment'
. ($GLOBALS['cfgRelation']['mimework'] ? ', mimetype, transformation, transformation_options' : '')
. ' FROM ' . PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_Util::backquote($GLOBALS['cfgRelation']['column_info'])
. ($GLOBALS['cfgRelation']['mimework']
? ', mimetype, transformation, transformation_options'
: '')
. ' FROM '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.'
. PMA_Util::backquote($GLOBALS['cfgRelation']['column_info'])
. ' WHERE '
. ' db_name = \'' . PMA_Util::sqlAddSlashes($source_db) . '\''
. ' db_name = \''
. PMA_Util::sqlAddSlashes($source_db) . '\''
. ' AND '
. ' table_name = \'' . PMA_Util::sqlAddSlashes($source_table) . '\''
. ' table_name = \''
. PMA_Util::sqlAddSlashes($source_table) . '\''
);
// Write every comment as new copied entry. [MIME]

10
po/pt_BR.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1.0-alpha1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-10-03 12:58-0400\n"
"PO-Revision-Date: 2013-10-11 19:34+0200\n"
"Last-Translator: Helder Santana <helder.bs.santana@gmail.com>\n"
"PO-Revision-Date: 2013-10-11 19:35+0200\n"
"Last-Translator: Rodrigo Souza <rodrigo.chrome@outlook.com>\n"
"Language-Team: Portuguese (Brazil) "
"<http://l10n.cihar.com/projects/phpmyadmin/master/pt_BR/>\n"
"Language: pt_BR\n"
@ -7482,9 +7482,9 @@ msgid ""
"as well as information about relevant configuration settings to send to the "
"phpMyAdmin team to help us in debugging the problem"
msgstr ""
"phpMyAdmin encontrou um erro. Coletamos dados sobre este erro bem como "
"informações relevantes sobre as configurações para enviar à equipe do "
"phpMyAdmin para nos ajudar a depurar o problema."
"O phpMyAdmin encontrou um erro. Coletamos dados sobre este erro assim como "
"informações relevantes sobre configurações para enviar à equipe do "
"phpMyAdmin para nos ajudar a depurar o problema"
#: libraries/error_report.lib.php:244
msgid "You may examine the data in the error report:"