Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_4_9-30-g48f545c
by Marc Delisle
The branch, STABLE has been updated
via 48f545c77fad2eda8866b294b48e9a4ef48476f5 (commit)
via 2506fbfac68115e54632bc065a292d59b922fe59 (commit)
via 133b1836b4b19f7a9b06fbf18f1a00d798e40d25 (commit)
via ba255de1b263ca9b86014414b131ec79e621b28c (commit)
via c93200a5bca1e8eefb07ed7420fe5ba12a57ed3b (commit)
via 458e015ec2bd5f887b3240faef0ca36f8474d3bf (commit)
via da62d86238949a5dbb42f64dcdfed81a4fc5b36a (commit)
via 91241f71d329d6692c9761ded0b19d6f75730fec (commit)
via cec8f1b0941595ea7673fa990b3291fd564220c0 (commit)
via 396e5716f89d291f366266e639c26e2ed8391dd2 (commit)
via a074b4c6e28b044670d21dec791ad0f909eba251 (commit)
via ea64f8f731928cfed87f7149a39dc797af8ce08a (commit)
via 0e707906e69ce90c4852a0fce2a0fac7db86a3cd (commit)
via bd3735ba584e7a49aee78813845245354b061f61 (commit)
via 629c5cbc3458ff6190bcada0080f1d065bb124ca (commit)
via 2f342d7231e9c907c026aea5edbf33966594d30e (commit)
via 3713680c374b90163dae6db227611d1d609d2947 (commit)
via 6e0a10494f6670b3e67d6fb219a96c8001dcea2c (commit)
via 5f78897bc8eadf5b399b9b4118bdb575f9f3e0a3 (commit)
via b02f4eec076ded51f258bb00c697ac72c13a9606 (commit)
via d68c8bb8ed1eea827e15041351f27089db7b679d (commit)
via be8bfa99b325f86fa3d231d51b5f85e200b0dec1 (commit)
via adc1fb2c6c59aa4a3641073b10d47a6829e63aae (commit)
via 9832c283f40c10d56a2e1dc3bd57525131ca1e4c (commit)
via 5e6173015709d67c40877bcf51a5c4520e83f9de (commit)
via dddcddbf38729f3362b2562671b510107df72b9b (commit)
via 9c278d020cde6ee32e830b2d0d7f11de8b59e68e (commit)
via c43babad7cbde73098ded7fe502027a1af731f4b (commit)
from 2d9f23ba49e6b207c420961f308a45db0ef59c7a (commit)
- Log -----------------------------------------------------------------
commit 48f545c77fad2eda8866b294b48e9a4ef48476f5
Merge: 2d9f23b 2506fbf
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 21 15:08:25 2011 -0500
Merge branch 'MAINT_3_4_9' into STABLE
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 +
Documentation.html | 4 +-
README | 2 +-
config.sample.inc.php | 4 +-
db_operations.php | 9 +-
js/navigation.js | 2 +-
js/update-location.js | 12 +
libraries/Config.class.php | 2 +-
libraries/Table.class.php | 18 +
libraries/check_user_privileges.lib.php | 7 +-
libraries/common.inc.php | 30 +-
libraries/common.lib.php | 2 +-
libraries/config/ConfigFile.class.php | 2 +-
libraries/db_info.inc.php | 2 +-
libraries/dbi/mysql.dbi.lib.php | 14 +-
libraries/display_export.lib.php | 6 +-
libraries/display_tbl.lib.php | 18 +-
libraries/session.inc.php | 3 +-
po/af.po | 2 +-
po/ar.po | 2 +-
po/az.po | 2 +-
po/be.po | 2 +-
po/be(a)latin.po | 2 +-
po/bg.po | 2 +-
po/bn.po | 2 +-
po/br.po | 2 +-
po/bs.po | 2 +-
po/ca.po | 2 +-
po/cs.po | 2 +-
po/cy.po | 2 +-
po/da.po | 2 +-
po/de.po | 2 +-
po/el.po | 2 +-
po/en_GB.po | 2 +-
po/es.po | 2 +-
po/et.po | 2 +-
po/eu.po | 2 +-
po/fa.po | 2 +-
po/fi.po | 2 +-
po/fr.po | 2 +-
po/gl.po | 2 +-
po/he.po | 2 +-
po/hi.po | 2 +-
po/hr.po | 2 +-
po/hu.po | 2 +-
po/id.po | 980 +++++++++++++++++--------------
po/it.po | 2 +-
po/ja.po | 2 +-
po/ka.po | 2 +-
po/ko.po | 4 +-
po/lt.po | 2 +-
po/lv.po | 2 +-
po/mk.po | 2 +-
po/ml.po | 2 +-
po/mn.po | 2 +-
po/ms.po | 2 +-
po/nb.po | 2 +-
po/nl.po | 2 +-
po/pl.po | 22 +-
po/pt.po | 265 +++++----
po/pt_BR.po | 126 +++--
po/ro.po | 2 +-
po/ru.po | 2 +-
po/si.po | 2 +-
po/sk.po | 2 +-
po/sl.po | 2 +-
po/sq.po | 2 +-
po/sr.po | 2 +-
po/sr(a)latin.po | 2 +-
po/sv.po | 2 +-
po/ta.po | 6 +-
po/te.po | 6 +-
po/th.po | 8 +-
po/tr.po | 2 +-
po/tt.po | 2 +-
po/ug.po | 6 +-
po/uk.po | 361 +++++++-----
po/ur.po | 2 +-
po/uz.po | 2 +-
po/uz(a)latin.po | 2 +-
po/zh_CN.po | 2 +-
po/zh_TW.po | 2 +-
82 files changed, 1185 insertions(+), 858 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e7c3bf9..c9ce4b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
phpMyAdmin - ChangeLog
======================
+3.4.9.0 (2011-12-21)
+- bug #3442028 [edit] Inline editing enum fields with null shows no dropdown
+- bug #3442004 [interface] DB suggestion not correct for user with underscore
+- bug #3438420 [core] Magic quotes removed in PHP 5.4
+- bug #3398788 [session] No feedback when result is empty (signon auth_type)
+- bug #3384035 [display] Problems regarding ShowTooltipAliasTB
+- bug #3306875 [edit] Can't rename a database that contains views
+- bug #3452506 [edit] Unable to move tables with triggers
+- bug #3449659 [navi] Fast filter broken with table tree
+- bug #3448485 [GUI] Firefox favicon frameset regression
+- [core] Better compatibility with mysql extension
+- [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20
+- [security] Self-XSS in setup (host parameter), see PMASA-2011-19
+
3.4.8.0 (2011-12-01)
- bug #3425230 [interface] enum data split at space char (more space to edit)
- bug #3426840 [interface] ENUM/SET editor can't handle commas in values
diff --git a/Documentation.html b/Documentation.html
index 87a65d2..87cf85c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>phpMyAdmin 3.4.8 - Documentation</title>
+ <title>phpMyAdmin 3.4.9 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
- 3.4.8
+ 3.4.9
Documentation
</h1>
</div>
diff --git a/README b/README
index 12e5e4e..5cb1a6a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.4.8
+Version 3.4.9
A set of PHP-scripts to manage MySQL over the web.
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 0ea16d5..1a22fc3 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -31,8 +31,8 @@ $cfg['Servers'][$i]['auth_type'] = 'cookie';
$cfg['Servers'][$i]['host'] = 'localhost';
$cfg['Servers'][$i]['connect_type'] = 'tcp';
$cfg['Servers'][$i]['compress'] = false;
-/* Select mysqli if your server has it */
-$cfg['Servers'][$i]['extension'] = 'mysql';
+/* Select mysql if your server does not have mysqli */
+$cfg['Servers'][$i]['extension'] = 'mysqli';
$cfg['Servers'][$i]['AllowNoPassword'] = false;
/*
diff --git a/db_operations.php b/db_operations.php
index ebd9333..f516a64 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -124,7 +124,6 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
}
unset($sql_constraints, $sql_drop_foreign_keys, $sql_structure);
-
foreach ($tables_full as $each_table => $tmp) {
// to be able to rename a db containing views,
// first all the views are collected and a stand-in is created
@@ -133,11 +132,17 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$views[] = $each_table;
// Create stand-in definition to resolve view dependencies
$sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n");
+ PMA_DBI_select_db($newname);
PMA_DBI_query($sql_view_standin);
$GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';';
- continue;
}
+ }
+ foreach ($tables_full as $each_table => $tmp) {
+ // skip the views; we have creted stand-in definitions
+ if (PMA_Table::isView($db, $each_table)) {
+ continue;
+ }
$back = $sql_query;
$sql_query = '';
diff --git a/js/navigation.js b/js/navigation.js
index 5052848..cec60e2 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -152,7 +152,7 @@ function fast_filter(value){
if (value && $elem.html().toLowerCase().indexOf(lowercase_value) == -1) {
$elem.parent().hide();
} else {
- $elem.parent().show();
+ $elem.parents('li').show();
}
});
}
diff --git a/js/update-location.js b/js/update-location.js
index d271cc8..0f1e372 100644
--- a/js/update-location.js
+++ b/js/update-location.js
@@ -31,12 +31,23 @@ function setURLHash(hash) {
}
if (hash_init_done) {
window.location.hash = "PMAURL:" + hash;
+ fix_favicon();
} else {
hash_to_set = "PMAURL:" + hash;
}
}
}
+// Fix favicon disappearing in Firefox when setting location.hash
+// See bug #3448485
+function fix_favicon() {
+ if (jQuery.browser.mozilla) {
+ // Move the link tags for the favicon to the bottom
+ // of the head element to force a reload of the favicon
+ $('head > link[href=\\.\\/favicon\\.ico]').appendTo('head');
+ }
+}
+
/**
* Handler for changing url according to the hash part, which is updated
* on each page to allow bookmarks.
@@ -55,6 +66,7 @@ $(document).ready(function(){
if (hash_to_set != "") {
window.location.hash = hash_to_set;
hash_to_set = "";
+ fix_favicon();
}
/* Indicate that we're done (and we are not going to change location */
hash_init_done = 1;
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index cbcb3e4..7749020 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.8');
+ $this->set('PMA_VERSION', '3.4.9');
/**
* @deprecated
*/
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index d7af2d7..5cb46fa 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -1033,6 +1033,17 @@ class PMA_Table
return false;
}
+ // If the table is moved to a different database drop its triggers first
+ $triggers = PMA_DBI_get_triggers($this->getDbName(), $this->getName(), '');
+ $handle_triggers = $this->getDbName() != $new_db && $triggers;
+ if ($handle_triggers) {
+ foreach ($triggers as $trigger) {
+ $sql = 'DROP TRIGGER IF EXISTS ' . PMA_backquote($this->getDbName()) . '.'
+ . PMA_backquote($trigger['name']) . ';';
+ PMA_DBI_query($sql);
+ }
+ }
+
/*
* tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13
*/
@@ -1041,6 +1052,13 @@ class PMA_Table
TO ' . $new_table->getFullName(true) . ';';
// I don't think a specific error message for views is necessary
if (! PMA_DBI_query($GLOBALS['sql_query'])) {
+ // Restore triggers in the old database
+ if ($handle_triggers) {
+ PMA_DBI_select_db($this->getDbName());
+ foreach ($triggers as $trigger) {
+ PMA_DBI_query($trigger['create']);
+ }
+ }
$this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName());
return false;
}
diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php
index 6dbc251..291213c 100644
--- a/libraries/check_user_privileges.lib.php
+++ b/libraries/check_user_privileges.lib.php
@@ -128,8 +128,11 @@ function PMA_analyseShowGrant()
&& substr(PMA_DBI_getError(), 1, 4) != 1044)
) {
substr(PMA_DBI_getError(), 1, 4) != 1044) check_user_privileges.lib.php me(), $new_table->getFullName()); � ��w�� u�* ��* ���* �����* ��w�� ����* ��w�� ��w�� k�* 6 � �! �! p�w�� ��w�� xt���* ��w�� ��* ��* p�w�� `�* ��w�� �oa��* u�* `a��* �da��* �ia��* ��* xt���* ��w�� ��w�� k�* �! �! p�w�� ��w�� H>ݴ�* ��w�� ��* ��* p�w�� `�* ��w�� ��w�� ��w�� 8���* �p� ��w�� u�* ��* ��w�� ��w�� k�* G H I J K M N O P p�w�� ��w�� H����* P�w�� ��* ��* p�w�� 0oa��* u�* ����* �)���* `a��* �da��* �ia��* ��* H����* P�w�� ��w�� k�* 8����* P�w�� ��w�� k�* (����* P�w�� ��w�� k�* ����* P�w�� �w�� k�* �na��* u�* �ia��* ��w�� �x���* e�* �da��* ��w�� yx���* e�* `a��* ��w�� Zx���* e�* �$���* ����* �)���* `a��* ���* �da��* �ia��* ��* 8���* �\��* ��w�� p����* ��w�� p�w�� k�* 5 6 7 8 : <