diff --git a/ChangeLog b/ChangeLog
index a03feb7875..ccddeff28c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/doc/config.rst b/doc/config.rst
index 10c6b12345..fd2d8657a2 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -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']
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 4cd0dc314e..9cd7cd58a7 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -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
*/
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 00c279ad1c..28404303c0 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -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,
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 20659e5d1b..bc5beff82f 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -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']) . "'";
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index f744846daf..3742e9ba07 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -366,7 +366,7 @@ function PMA_getHtmlForSqlQueryFormBookmark()
foreach ($bookmark_list as $key => $value) {
$html .= '' . "\n";
}
// is required for correct display with styles/line height
diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index 51dd2a5304..ab23b27d60 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -1704,10 +1704,21 @@ function PMA_getHtmlForAddColumn($columns_list)
. 'value="first" data-pos = "first">'
. __('at beginning of table')
. '';
+ $cols_count = count($columns_list);
foreach ($columns_list as $one_column_name) {
- $column_selector .= '';
}
$column_selector .= '';
diff --git a/po/cs.po b/po/cs.po
index e1b5079f86..8964a94601 100644
--- a/po/cs.po
+++ b/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 \n"
"Language-Team: Czech "
"\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 ""
diff --git a/po/tr.po b/po/tr.po
index d28a6fbe9c..dffda3f7b4 100644
--- a/po/tr.po
+++ b/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 \n"
"Language-Team: Turkish "
"\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 ""
diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php
index 30994bf990..2d826c33b1 100644
--- a/test/libraries/PMA_PMD_common_test.php
+++ b/test/libraries/PMA_PMD_common_test.php
@@ -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);
}
}
-?>
\ No newline at end of file
+?>
diff --git a/view_operations.php b/view_operations.php
index 153249a3df..82c7db760e 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -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);
}