Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
This commit is contained in:
Madhura Jayaratne
commit
15caf48a9a
@ -36,6 +36,8 @@ phpMyAdmin - ChangeLog
|
||||
- bug PHP 7 compatibility in php-gettext
|
||||
- bug PHP 7 compatibility in bfShapeFiles
|
||||
- bug PHP 7 session_regenerate_id() warning
|
||||
- bug #4857 Alter table after changing column name error
|
||||
- bug #4830 Maximum execution time exceeded in Util.class.php
|
||||
|
||||
4.4.2.0 (2015-04-13)
|
||||
- bug #4835 PMA_hideShowConnection not called after submit_num_fields
|
||||
|
||||
@ -2331,8 +2331,7 @@ Design customization
|
||||
|
||||
Defines the place where table row links (Edit, Copy, Delete) would be
|
||||
put when tables contents are displayed (you may have them displayed at
|
||||
the left side, right side, both sides or nowhere). "left" and "right"
|
||||
are parsed as "top" and "bottom" with vertical display mode.
|
||||
the left side, right side, both sides or nowhere).
|
||||
|
||||
.. config:option:: $cfg['RememberSorting']
|
||||
|
||||
|
||||
@ -92,9 +92,6 @@ AJAX.registerOnload('tbl_structure.js', function () {
|
||||
indexes = [];
|
||||
fulltext_indexes = [];
|
||||
|
||||
//by default select the last option to add new column (adds at end of the table)
|
||||
$("select[name=after_field] option:last").attr("selected","selected");
|
||||
|
||||
/**
|
||||
*Ajax action for submitting the "Column Change" and "Add Column" form
|
||||
*/
|
||||
|
||||
@ -2696,7 +2696,9 @@ class PMA_DisplayResults
|
||||
} // end if (1)
|
||||
|
||||
// 2. Displays the rows' values
|
||||
$this->_setMimeMap();
|
||||
if (is_null($this->__get('mime_map'))) {
|
||||
$this->_setMimeMap();
|
||||
}
|
||||
$table_body_html .= $this->_getRowValues(
|
||||
$dt_result, $row, $row_no, $col_order, $map,
|
||||
$grid_edit_class, $col_visib, $where_clause,
|
||||
|
||||
@ -93,7 +93,7 @@ function PMA_Bookmark_getList($db = false)
|
||||
} else {
|
||||
$query = "SELECT `label`, `id`, `query`, `dbase` AS `db`,"
|
||||
. " IF (`user` = '', true, false) AS `shared`"
|
||||
. " FROM ". PMA_Util::backquote($cfgBookmark['db'])
|
||||
. " FROM " . PMA_Util::backquote($cfgBookmark['db'])
|
||||
. "." . PMA_Util::backquote($cfgBookmark['table'])
|
||||
. " WHERE `user` = '' OR"
|
||||
. " `user` = '" . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . "'";
|
||||
|
||||
@ -366,7 +366,7 @@ function PMA_getHtmlForSqlQueryFormBookmark()
|
||||
foreach ($bookmark_list as $key => $value) {
|
||||
$html .= '<option value="' . htmlspecialchars($key) . '"'
|
||||
. ' data-varcount="' . PMA_Bookmark_getVariableCount($value['query'])
|
||||
.'">'
|
||||
. '">'
|
||||
. htmlspecialchars($value['label']) . '</option>' . "\n";
|
||||
}
|
||||
// is required for correct display with styles/line height
|
||||
|
||||
@ -1704,10 +1704,21 @@ function PMA_getHtmlForAddColumn($columns_list)
|
||||
. 'value="first" data-pos = "first">'
|
||||
. __('at beginning of table')
|
||||
. '</option>';
|
||||
$cols_count = count($columns_list);
|
||||
foreach ($columns_list as $one_column_name) {
|
||||
$column_selector .= '<option '
|
||||
. 'value="' . htmlspecialchars($one_column_name) . '">'
|
||||
. sprintf(__('after %s'), htmlspecialchars($one_column_name))
|
||||
//by default select the last column (add column at the end of the table)
|
||||
if (--$cols_count == 0) {
|
||||
$column_selector .= '<option '
|
||||
. 'value="' . htmlspecialchars($one_column_name)
|
||||
. '" selected="selected">';
|
||||
} else {
|
||||
$column_selector .= '<option '
|
||||
. 'value="' . htmlspecialchars($one_column_name) . '">';
|
||||
}
|
||||
$column_selector .= sprintf(
|
||||
__('after %s'),
|
||||
htmlspecialchars($one_column_name)
|
||||
)
|
||||
. '</option>';
|
||||
}
|
||||
$column_selector .= '</select>';
|
||||
|
||||
11
po/cs.po
11
po/cs.po
@ -6,7 +6,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-04-10 10:21-0400\n"
|
||||
"PO-Revision-Date: 2015-04-11 18:43+0200\n"
|
||||
"PO-Revision-Date: 2015-04-17 14:32+0200\n"
|
||||
"Last-Translator: Ondra Šimeček <ondrasek.simecek@gmail.com>\n"
|
||||
"Language-Team: Czech "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/cs/>\n"
|
||||
@ -9177,6 +9177,8 @@ msgid ""
|
||||
"There are large item groups in navigation panel which may affect the "
|
||||
"performance. Consider disabling item grouping in the navigation panel."
|
||||
msgstr ""
|
||||
"Byly nalezeny obsáhlé skupiny položek v navigačním panelu, které mohou "
|
||||
"ovlivnit výkon. Zvažte deaktivování seskupování položek v navigačním panelu."
|
||||
|
||||
#: libraries/navigation/NavigationTree.class.php:871
|
||||
#, fuzzy, php-format
|
||||
@ -9433,6 +9435,11 @@ msgid ""
|
||||
"on which form a repeating group. In this case a new table (book_id, author) "
|
||||
"should be created."
|
||||
msgstr ""
|
||||
"Nemáte skupinu dvou nebo více sloupců, které jsou si významově blízké a "
|
||||
"opakují stejný atribut? Například, tabulka, která obsahuje data o knihách, "
|
||||
"může obsahovat sloupce jako id_knihy, autor1, autor2, autor3 a další, které "
|
||||
"vytvářejí opakující se skupinu atributů (autoři). Pokud ano, měli byste "
|
||||
"vytvořit novou tabulku (id_knihy, autor)."
|
||||
|
||||
#: libraries/normalization.lib.php:259
|
||||
msgid ""
|
||||
@ -9471,6 +9478,8 @@ msgid ""
|
||||
"The primary key ( %1$s ) consists of more than one column so we need to find "
|
||||
"the partial dependencies."
|
||||
msgstr ""
|
||||
"Primární klíč ( %1$s ) obsahuje více než jeden sloupec, takže potřebujeme "
|
||||
"nalézt dílčí závislosti."
|
||||
|
||||
#: libraries/normalization.lib.php:327 libraries/normalization.lib.php:692
|
||||
msgid ""
|
||||
|
||||
5
po/tr.po
5
po/tr.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2015-04-10 10:21-0400\n"
|
||||
"PO-Revision-Date: 2015-04-11 22:10+0200\n"
|
||||
"PO-Revision-Date: 2015-04-19 08:39+0200\n"
|
||||
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
|
||||
"Language-Team: Turkish "
|
||||
"<https://hosted.weblate.org/projects/phpmyadmin/master/tr/>\n"
|
||||
@ -10165,10 +10165,9 @@ msgid "View structure"
|
||||
msgstr "Yapıyı göster"
|
||||
|
||||
#: libraries/plugins/export/ExportPdf.class.php:287
|
||||
#, fuzzy
|
||||
#| msgid "and then"
|
||||
msgid "Stand in"
|
||||
msgstr "ve ondan sonra"
|
||||
msgstr "Bulunduğu"
|
||||
|
||||
#: libraries/plugins/export/ExportSql.class.php:91
|
||||
msgid ""
|
||||
|
||||
@ -167,7 +167,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
|
||||
->with(
|
||||
"SELECT `page_nr` FROM `pmadb`.`pdf_pages`"
|
||||
. " WHERE `db_name` = '" . $db . "'"
|
||||
. " AND `page_descr` = '" . $db. "'",
|
||||
. " AND `page_descr` = '" . $db . "'",
|
||||
null,
|
||||
null,
|
||||
2,
|
||||
@ -199,7 +199,7 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
|
||||
->with(
|
||||
"SELECT `page_nr` FROM `pmadb`.`pdf_pages`"
|
||||
. " WHERE `db_name` = '" . $db . "'"
|
||||
. " AND `page_descr` = '" . $db. "'",
|
||||
. " AND `page_descr` = '" . $db . "'",
|
||||
null,
|
||||
null,
|
||||
2,
|
||||
@ -224,4 +224,4 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
|
||||
$this->assertEquals($first_pg, $result);
|
||||
}
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
@ -71,7 +71,7 @@ if (isset($result)) {
|
||||
unset($warning_messages);
|
||||
}
|
||||
echo PMA_Util::getMessage(
|
||||
$_message, $sql_query, $_type, $is_view = true
|
||||
$_message, $sql_query, $_type
|
||||
);
|
||||
unset($_message, $_type);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
