Merge branch 'MAINT_3_4_3' into QA_3_4
This commit is contained in:
12
ChangeLog
12
ChangeLog
@@ -95,7 +95,7 @@ phpMyAdmin - ChangeLog
|
||||
+ patch #2974341 [structure] Clicking on table name in db Structure should
|
||||
Browse the table if possible, thanks to bhdouglass - dougboybhd
|
||||
+ patch #2975533 [search] New search operators, thanks to
|
||||
Martynas Mickevičius
|
||||
Martynas MickeviÄius
|
||||
+ patch #2967320 [designer] Colored relations based on the primary key,
|
||||
thanks to GreenRover - greenrover
|
||||
- [core] Provide way for vendors to easily change paths to config files.
|
||||
@@ -249,7 +249,7 @@ phpMyAdmin - ChangeLog
|
||||
|
||||
3.3.7.0 (2010-09-07)
|
||||
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
|
||||
a page size increase, thanks to Martin Schönberger - mad05
|
||||
a page size increase, thanks to Martin Schönberger - mad05
|
||||
|
||||
3.3.6.0 (2010-08-28)
|
||||
- bug #3033063 [core] Navi gets wrong db name
|
||||
@@ -270,7 +270,7 @@ phpMyAdmin - ChangeLog
|
||||
|
||||
3.3.5.0 (2010-07-26)
|
||||
- patch #2932113 [information_schema] Slow export when having lots of
|
||||
databases, thanks to Stéphane Pontier - shadow_walker
|
||||
databases, thanks to Stéphane Pontier - shadow_walker
|
||||
- bug #3022705 [import] Import button does not work in Catalan when there
|
||||
is no progress bar possible
|
||||
- bug [replication] Do not offer information_schema in the list of databases
|
||||
@@ -310,9 +310,9 @@ phpMyAdmin - ChangeLog
|
||||
- patch #2984893 [engines] InnoDB storage page emits a warning,
|
||||
thanks to Madhura Jayaratne - madhuracj
|
||||
- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work,
|
||||
thanks to Björn Wiberg - bwiberg
|
||||
thanks to Björn Wiberg - bwiberg
|
||||
- bug #2983066 [interface] Flush table on table operations shows the query twice,
|
||||
thanks to Martynas Mickevičius - BlinK_
|
||||
thanks to Martynas MickeviÄius - BlinK_
|
||||
- bug #2983060, patch #2987900 [interface] Fix initial state of tables in
|
||||
designer, thanks to Sutharshan Balachandren.
|
||||
- bug #2983062, patch #2989408 [engines] Fix warnings when changing table
|
||||
@@ -391,7 +391,7 @@ phpMyAdmin - ChangeLog
|
||||
+ rfe #2839504 [engines] Support InnoDB plugin's new row formats
|
||||
+ [core] Added ability for synchronizing databases among servers.
|
||||
+ [lang] #2843101 Dutch update, thanks to scavenger2008
|
||||
+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo
|
||||
+ [lang] Galician update, thanks to Xosé Calvo - xosecalvo
|
||||
+ [export] Added MediaWiki export module,
|
||||
thanks to Derek Schaefer - drummingds1
|
||||
+ [lang] Turkish update, thanks to Burak Yavuz
|
||||
|
@@ -263,11 +263,10 @@ function Swekey_login($input_name, $input_go)
|
||||
}
|
||||
}
|
||||
|
||||
if (strstr($_SERVER['QUERY_STRING'],'session_to_unset') != false)
|
||||
if (!empty($_GET['session_to_unset']))
|
||||
{
|
||||
parse_str($_SERVER['QUERY_STRING']);
|
||||
session_write_close();
|
||||
session_id($session_to_unset);
|
||||
session_id($_GET['session_to_unset']);
|
||||
session_start();
|
||||
$_SESSION = array();
|
||||
session_write_close();
|
||||
|
@@ -1308,7 +1308,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|
||||
if ($GLOBALS['cfgRelation']['mimework'] && $GLOBALS['cfg']['BrowseMIME']) {
|
||||
|
||||
if (isset($GLOBALS['mime_map'][$meta->name]['mimetype']) && isset($GLOBALS['mime_map'][$meta->name]['transformation']) && !empty($GLOBALS['mime_map'][$meta->name]['transformation'])) {
|
||||
$include_file = $GLOBALS['mime_map'][$meta->name]['transformation'];
|
||||
$include_file = PMA_securePath($GLOBALS['mime_map'][$meta->name]['transformation']);
|
||||
|
||||
if (file_exists('./libraries/transformations/' . $include_file)) {
|
||||
$transformfunction_name = str_replace('.inc.php', '', $GLOBALS['mime_map'][$meta->name]['transformation']);
|
||||
|
@@ -624,7 +624,7 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm
|
||||
$Create_Query = PMA_DBI_fetch_value("SHOW CREATE TABLE " . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), 0, 1, $src_link);
|
||||
|
||||
// Replace the src table name with a `dbname`.`tablename`
|
||||
$Create_Table_Query = preg_replace('/' . PMA_backquote($uncommon_tables[$table_index]) . '/',
|
||||
$Create_Table_Query = preg_replace('/' . preg_quote(PMA_backquote($uncommon_tables[$table_index]), '/') . '/',
|
||||
PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]),
|
||||
$Create_Query,
|
||||
$limit = 1
|
||||
|
@@ -39,7 +39,7 @@ class ConfigGenerator
|
||||
if ($cf->getServerCount() > 0) {
|
||||
$ret .= "/* Servers configuration */$crlf\$i = 0;" . $crlf . $crlf;
|
||||
foreach ($c['Servers'] as $id => $server) {
|
||||
$ret .= '/* Server: ' . strtr($cf->getServerName($id), '*/', '-') . " [$id] */" . $crlf
|
||||
$ret .= '/* Server: ' . strtr($cf->getServerName($id) . " [$id] ", '*/', '-') . "*/" . $crlf
|
||||
. '$i++;' . $crlf;
|
||||
foreach ($server as $k => $v) {
|
||||
$k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
|
||||
|
Reference in New Issue
Block a user