diff options
| author | Christian Foellmann <foellmann@foe-services.de> | 2015-07-19 18:30:04 +0300 |
|---|---|---|
| committer | Christian Foellmann <foellmann@foe-services.de> | 2015-07-19 18:30:04 +0300 |
| commit | c462efc8f59b4c274ba621b37ce8353720e7dd9f (patch) | |
| tree | 73a0178814d59dfc9453377424cf52e99aa0d42f | |
| parent | 76822f57232a2aaa34d059ecefc3f4276c0b5677 (diff) | |
UPDATE 4.4.11.04.4.11.0
41 files changed, 92 insertions, 58 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad567efbcd..e0068e8062 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,4 +22,4 @@ tag, you are giving permission to license the patch as GPLv2-or-later. See You can find more information on our website: -http://www.phpmyadmin.net/home_page/improve.php +https://www.phpmyadmin.net/contribute/ @@ -1,6 +1,25 @@ phpMyAdmin - ChangeLog ====================== +4.4.11.0 (2015-07-06) +- bug Missing selected/entered values when editing active options in visual query builder +- bug #4969 Autoload from prefs_storage not behaving properly +- bug #4972 Incorrect length computed for binary data +- bug Remove character set from create_tables_drizzle.sql +- bug #4973 Users overview needs clarification +- bug #4974 Creating a database from console doesn't update navigation panel +- bug #4844 FAQ 1.17 needs an update + +4.4.10.0 (2015-06-17) +- bug #4950 Issues in database selection for replication +- bug #4951 Trying to save chart as image crashes the browser +- bug #4953 cant drag sql.gz file onto import input +- bug #4960 Table creation results in GET request with missing server parameter that invalidates the session +- bug #4961 Javascript error when Designer is opened +- bug #4962 Insert by foreign key scrolls page to top +- bug #4955 Clicking on the navi logo does not always work +- bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked + 4.4.9.0 (2015-06-04) - bug #4920 relation view doesn't list fields of table in other database - bug #4905 Sorting by an alias @@ -1,11 +1,11 @@ phpMyAdmin - Readme =================== -Version 4.4.9 +Version 4.4.11 A set of PHP-scripts to manage MySQL over the web. -http://www.phpmyadmin.net/ +https://www.phpmyadmin.net/ Summary ------- diff --git a/changelog.php b/changelog.php index 5066ffe03e..230eba1416 100644 --- a/changelog.php +++ b/changelog.php @@ -108,7 +108,7 @@ $replaces = array( // PMASAentries '/(PMASA-[0-9]+-[0-9]+)/' - => '<a href="http://www.phpmyadmin.net/home_page/security/\\1.php">\\1</a>', + => '<a href="https://www.phpmyadmin.net/security/\\1/">\\1</a>', // Highlight releases (with links) '/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/' diff --git a/composer.json b/composer.json index be78dcc2d7..ac89350612 100644 --- a/composer.json +++ b/composer.json @@ -3,17 +3,17 @@ "type": "application", "description": "Deployment ready version of phpmyadmin-all-languages. All Languages; without: doc, examples, scripts & setup folders!", "keywords": ["phpmyadmin","mysql","web"], - "homepage": "http://www.phpmyadmin.net/", + "homepage": "https://www.phpmyadmin.net/", "license": "GPL-2.0+", "authors": [ { "name": "The phpMyAdmin Team", "email": "phpmyadmin-devel@lists.sourceforge.net", - "homepage": "http://www.phpmyadmin.net/home_page/team.php" + "homepage": "https://www.phpmyadmin.net/team/" } ], "support": { - "forum": "https://sourceforge.net/p/phpmyadmin/discussion/Help", + "forum": "https://www.phpmyadmin.net/support/", "issues": "https://sourceforge.net/p/phpmyadmin/bugs/", "wiki": "http://wiki.phpmyadmin.net/", "source": "https://github.com/phpmyadmin/phpmyadmin" @@ -410,14 +410,14 @@ PMA_printListItem( PMA_printListItem( __('Contribute'), 'li_pma_contribute', - PMA_linkURL('http://www.phpmyadmin.net/home_page/improve.php'), + PMA_linkURL('https://www.phpmyadmin.net/contribute/'), null, '_blank' ); PMA_printListItem( __('Get support'), 'li_pma_support', - PMA_linkURL('http://www.phpmyadmin.net/home_page/support.php'), + PMA_linkURL('https://www.phpmyadmin.net/support/'), null, '_blank' ); @@ -643,7 +643,7 @@ if (file_exists('libraries/language_stats.inc.php')) { ) { trigger_error( 'You are using an incomplete translation, please help to make it ' - . 'better by [a@http://www.phpmyadmin.net/home_page/improve.php' + . 'better by [a@https://www.phpmyadmin.net/contribute/' . '#translate@_blank]contributing[/a].', E_USER_NOTICE ); diff --git a/js/common.js b/js/common.js index 2b29d93cea..22c38d2c12 100644 --- a/js/common.js +++ b/js/common.js @@ -172,7 +172,7 @@ PMA_DROP_IMPORT = { /** * @var string array, allowed extensions for compressed files */ - allowedCompressedExtensions: ['gzip', 'bzip2', 'zip'], + allowedCompressedExtensions: ['gz', 'bz2', 'zip'], /** * @var obj array to store message returned by import_status.php */ diff --git a/js/console.js b/js/console.js index 6523c770e3..f824b9ae52 100644 --- a/js/console.js +++ b/js/console.js @@ -173,7 +173,7 @@ var PMA_console = { PMA_console.ajaxCallback(data); } catch (e) { console.log("Invalid JSON!" + e.message); - if(AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') { + if(AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') { PMA_ajaxShowMessage($('<div />',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'})); AJAX.active = false; AJAX.xhr = null; @@ -235,6 +235,7 @@ var PMA_console = { .val(PMA_consoleMessages.appendQuery({sql_query: queryString}).message_id); PMA_console.$requestForm.trigger('submit'); PMA_consoleInput.clear(); + PMA_reloadNavigation(); }, ajaxCallback: function(data) { if(data && data.console_message_id) { diff --git a/js/functions.js b/js/functions.js index de85c226b1..d5f662858c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2706,7 +2706,7 @@ AJAX.registerOnload('functions.js', function () { // Redirect to table structure page on creation of new table var params_12 = 'ajax_request=true&ajax_page_request=true'; params_12 += AJAX.cache.menus.getRequestParam(); - tblStruct_url = 'tbl_structure.php?db='+ data._params.db + '&token='+data._params.token +'&goto=db_structure.php&table='+data._params.table+''; + tblStruct_url = 'tbl_structure.php?server=' + data._params.server + '&db='+ data._params.db + '&token='+data._params.token +'&goto=db_structure.php&table='+data._params.table+''; $.get(tblStruct_url, params_12, AJAX.responseHandler); } else { PMA_ajaxShowMessage( diff --git a/js/jqplot/jquery.jqplot.js b/js/jqplot/jquery.jqplot.js index 49812b77fc..fc4f8b7406 100644 --- a/js/jqplot/jquery.jqplot.js +++ b/js/jqplot/jquery.jqplot.js @@ -9139,7 +9139,7 @@ for (var i=0; i<wl; i++) { w += words[i]; - if (context.measureText(w).width > tagwidth) { + if (context.measureText(w).width > tagwidth && w.length > words[i].length) { breaks.push(i); w = ''; i--; diff --git a/js/line_counts.php b/js/line_counts.php index 079b22f651..84e9e9934e 100644 --- a/js/line_counts.php +++ b/js/line_counts.php @@ -16,7 +16,6 @@ $LINE_COUNT = array(); $LINE_COUNT["OpenStreetMap.js"] = 126; $LINE_COUNT["big_ints.js"] = 67; $LINE_COUNT["canvg/canvg.js"] = 2508; -$LINE_COUNT["chart.js"] = 664; $LINE_COUNT["codemirror/addon/hint/show-hint.js"] = 394; $LINE_COUNT["codemirror/addon/hint/sql-hint.js"] = 248; $LINE_COUNT["codemirror/addon/runmode/runmode.js"] = 72; @@ -30,7 +29,6 @@ $LINE_COUNT["db_operations.js"] = 157; $LINE_COUNT["db_search.js"] = 239; $LINE_COUNT["db_tracking.js"] = 84; $LINE_COUNT["doclinks.js"] = 365; -$LINE_COUNT["error_report.js"] = 340; $LINE_COUNT["gis_data_editor.js"] = 396; $LINE_COUNT["import.js"] = 167; $LINE_COUNT["jqplot/excanvas.js"] = 1438; @@ -182,9 +180,7 @@ $LINE_COUNT["jquery/src/jquery/var/support.js"] = 4; $LINE_COUNT["jquery/src/jquery/var/toString.js"] = 5; $LINE_COUNT["jquery/src/jquery/wrap.js"] = 75; $LINE_COUNT["keyhandler.js"] = 145; -$LINE_COUNT["menu-resizer.js"] = 182; $LINE_COUNT["multi_column_sort.js"] = 81; -$LINE_COUNT["normalization.js"] = 707; $LINE_COUNT["openlayers/OpenLayers.js"] = 2680; $LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebug.js"] = 674; $LINE_COUNT["openlayers/src/openlayers/lib/Firebug/firebugx.js"] = 9; @@ -473,28 +469,22 @@ $LINE_COUNT["openlayers/src/openlayers/lib/Rico/Color.js"] = 244; $LINE_COUNT["openlayers/src/openlayers/lib/Rico/Corner.js"] = 329; $LINE_COUNT["pmd/designer_db.js"] = 136; $LINE_COUNT["pmd/designer_objects.js"] = 17; -$LINE_COUNT["pmd/history.js"] = 811; +$LINE_COUNT["pmd/designer_page.js"] = 164; +$LINE_COUNT["pmd/history.js"] = 813; $LINE_COUNT["pmd/iecanvas.js"] = 147; $LINE_COUNT["pmd/init.js"] = 40; -$LINE_COUNT["pmd/designer_page.js"] = 164; -$LINE_COUNT["pmd/move.js"] = 1993; -$LINE_COUNT["replication.js"] = 72; +$LINE_COUNT["pmd/move.js"] = 2003; $LINE_COUNT["server_databases.js"] = 137; $LINE_COUNT["server_plugins.js"] = 30; $LINE_COUNT["server_status_advisor.js"] = 93; -$LINE_COUNT["server_status_monitor.js"] = 2172; $LINE_COUNT["server_status_processes.js"] = 189; $LINE_COUNT["server_status_queries.js"] = 34; -$LINE_COUNT["server_status_sorter.js"] = 89; $LINE_COUNT["server_status_variables.js"] = 103; $LINE_COUNT["server_user_groups.js"] = 42; $LINE_COUNT["server_variables.js"] = 147; $LINE_COUNT["sprintf.js"] = 211; $LINE_COUNT["tbl_find_replace.js"] = 47; -$LINE_COUNT["tbl_gis_visualization.js"] = 353; -$LINE_COUNT["tbl_select.js"] = 395; $LINE_COUNT["tbl_tracking.js"] = 95; -$LINE_COUNT["tbl_zoom_plot_jqplot.js"] = 638; $LINE_COUNT["tracekit/tracekit.js"] = 1114; $LINE_COUNT["transformations/image_upload.js"] = 28; $LINE_COUNT["transformations/json.js"] = 17; @@ -503,21 +493,31 @@ $LINE_COUNT["transformations/json_editor.js"] = 17; $LINE_COUNT["transformations/sql_editor.js"] = 30; $LINE_COUNT["transformations/xml_editor.js"] = 16; $LINE_COUNT["ajax.js"] = 1031; +$LINE_COUNT["chart.js"] = 664; $LINE_COUNT["config.js"] = 798; -$LINE_COUNT["console.js"] = 1032; +$LINE_COUNT["console.js"] = 1033; $LINE_COUNT["db_central_columns.js"] = 201; $LINE_COUNT["db_qbe.js"] = 64; $LINE_COUNT["db_structure.js"] = 391; +$LINE_COUNT["error_report.js"] = 340; $LINE_COUNT["export.js"] = 401; $LINE_COUNT["functions.js"] = 4580; $LINE_COUNT["indexes.js"] = 697; $LINE_COUNT["makegrid.js"] = 1973; +$LINE_COUNT["menu-resizer.js"] = 182; $LINE_COUNT["navigation.js"] = 1505; +$LINE_COUNT["normalization.js"] = 707; +$LINE_COUNT["replication.js"] = 73; $LINE_COUNT["rte.js"] = 944; $LINE_COUNT["server_privileges.js"] = 451; -$LINE_COUNT["sql.js"] = 842; +$LINE_COUNT["server_status_monitor.js"] = 2172; +$LINE_COUNT["server_status_sorter.js"] = 89; +$LINE_COUNT["sql.js"] = 843; $LINE_COUNT["tbl_change.js"] = 754; $LINE_COUNT["tbl_chart.js"] = 437; +$LINE_COUNT["tbl_gis_visualization.js"] = 353; $LINE_COUNT["tbl_operations.js"] = 240; $LINE_COUNT["tbl_relation.js"] = 234; +$LINE_COUNT["tbl_select.js"] = 395; $LINE_COUNT["tbl_structure.js"] = 397; +$LINE_COUNT["tbl_zoom_plot_jqplot.js"] = 638; diff --git a/js/pmd/history.js b/js/pmd/history.js index 1577f4e338..3fdfcfd793 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -199,6 +199,7 @@ function history_edit(index) document.getElementById('query_having').style.display = 'block'; } if (type == "Rename") { + document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to(); document.getElementById('query_rename_to').style.left = '530px'; document.getElementById('query_rename_to').style.top = '130px'; document.getElementById('query_rename_to').style.position = 'absolute'; @@ -207,6 +208,7 @@ function history_edit(index) document.getElementById('query_rename_to').style.display = 'block'; } if (type == "Aggregate") { + document.getElementById('e_operator').value = history_array[index].get_obj().get_operator(); document.getElementById('query_Aggregate').style.left = '530px'; document.getElementById('query_Aggregate').style.top = '130px'; document.getElementById('query_Aggregate').style.position = 'absolute'; diff --git a/js/pmd/move.js b/js/pmd/move.js index 1cef6fa4c9..0d86fa1918 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -358,7 +358,12 @@ function Re_load() //alert(tab_hide_button.innerHTML); if (tab_hide_button.innerHTML == 'v') { - row_offset_top = document.getElementById(key2 + "." + key3).offsetTop; + var fromColumn = document.getElementById(key2 + "." + key3); + if (fromColumn) { + row_offset_top = fromColumn.offsetTop; + } else { + continue; + } } var y1 = document.getElementById(key2).offsetTop + @@ -369,8 +374,13 @@ function Re_load() row_offset_top = 0; tab_hide_button = document.getElementById('id_hide_tbody_' + contr[K][key][key2][key3][0]); if (tab_hide_button.innerHTML == 'v') { - row_offset_top = document.getElementById(contr[K][key][key2][key3][0] - + '.' + contr[K][key][key2][key3][1]).offsetTop; + var toColumn = document.getElementById(contr[K][key][key2][key3][0] + + '.' + contr[K][key][key2][key3][1]); + if (toColumn) { + row_offset_top = toColumn.offsetTop; + } else { + continue; + } } var y2 = diff --git a/js/replication.js b/js/replication.js index 888bd9ddf8..d9dbf15dcf 100644 --- a/js/replication.js +++ b/js/replication.js @@ -68,5 +68,6 @@ AJAX.registerOnload('replication.js', function () { }); $('#db_reset_href').click(function () { $('#db_select option:selected').prop('selected', false); + $('#db_select').trigger('change'); }); }); @@ -631,7 +631,8 @@ function browseForeignDialog($this_a) }); }).done(function () { var showAll = false; - $(tableId).on('click', 'td a.foreign_value', function () { + $(tableId).on('click', 'td a.foreign_value', function (e) { + e.preventDefault(); var $input = $this_a.prev('input[type=text]'); // Check if input exists or get CEdit edit_box if ($input.length === 0 ) { diff --git a/libraries/Config.class.php b/libraries/Config.class.php index e622cc437e..4a52ad1c5b 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.9'); + $this->set('PMA_VERSION', '4.4.11'); /** * @deprecated */ diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 909e133343..ca0b6f1497 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -5126,7 +5126,7 @@ class PMA_DisplayResults if (isset($content)) { - $size = /*overload*/mb_strlen($content); + $size = /*overload*/mb_strlen($content, '8bit'); $display_size = PMA_Util::formatByteDown($size, 3, 1); $result .= ' - ' . $display_size[0] . ' ' . $display_size[1]; diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 45fd2c82bc..189f6d35d8 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4270,7 +4270,7 @@ class PMA_Util $response = $_SESSION['cache']['version_check']['response']; } else { $save = true; - $file = 'http://www.phpmyadmin.net/home_page/version.json'; + $file = 'https://www.phpmyadmin.net/home_page/version.json'; if (ini_get('allow_url_fopen')) { $context = array( 'http' => array( diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 4eef3ff781..8cf7fcacd2 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -1233,7 +1233,7 @@ function PMA_getAggregateQueryPanel() $html .= '<option value="min"> MIN </option>'; $html .= '<option value="max"> MAX </option>'; $html .= '<option value="avg"> AVG </option>'; - $html .= '<option value="avg"> COUNT </option>'; + $html .= '<option value="count"> COUNT </option>'; $html .= '</select>'; $html .= '</td></tr>'; $html .= '</tbody>'; diff --git a/libraries/language_stats.inc.php b/libraries/language_stats.inc.php index 9511f7999c..ebe543cdca 100644 --- a/libraries/language_stats.inc.php +++ b/libraries/language_stats.inc.php @@ -8,7 +8,7 @@ $GLOBALS["language_stats"] = array ( 'az' => 58, 'be' => 27, 'be@latin' => 26, - 'bg' => 62, + 'bg' => 63, 'bn' => 82, 'br' => 19, 'bs' => 14, @@ -21,7 +21,7 @@ $GLOBALS["language_stats"] = array ( 'el' => 100, 'en_GB' => 88, 'eo' => 2, - 'es' => 98, + 'es' => 99, 'et' => 100, 'eu' => 17, 'fa' => 27, @@ -29,13 +29,13 @@ $GLOBALS["language_stats"] = array ( 'fr' => 100, 'fy' => 21, 'gl' => 76, - 'he' => 18, + 'he' => 19, 'hi' => 41, 'hr' => 32, 'hu' => 100, 'hy' => 3, 'ia' => 69, - 'id' => 73, + 'id' => 76, 'it' => 100, 'ja' => 73, 'ka' => 15, @@ -52,19 +52,19 @@ $GLOBALS["language_stats"] = array ( 'ml' => 1, 'mn' => 22, 'ms' => 11, - 'nb' => 60, + 'nb' => 63, 'ne' => 1, 'nl' => 100, 'pa' => 2, 'pl' => 86, 'pt' => 59, - 'pt_BR' => 99, + 'pt_BR' => 100, 'ro' => 58, 'ru' => 97, 'si' => 65, - 'sk' => 84, - 'sl' => 99, - 'sq' => 99, + 'sk' => 85, + 'sl' => 100, + 'sq' => 100, 'sr' => 25, 'sr@latin' => 50, 'sv' => 88, diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 3f0cab2924..73a6dafb92 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -107,11 +107,11 @@ class PMA_NavigationHeader break; case 'main': // do not add our parameters for an external link - $navLogoLinkLower = /*overload*/mb_strtolower( - $GLOBALS['cfg']['NavigationLogoLink'] + $host = parse_url( + $GLOBALS['cfg']['NavigationLogoLink'], PHP_URL_HOST ); - if (/*overload*/mb_substr($navLogoLinkLower, 0, 4) !== '://') { - $retval .= $GLOBALS['url_query'] . '"'; + if (empty($host)) { + $retval .= PMA_URL_getCommon() . '"'; } else { $retval .= '" target="_blank"'; } diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index b0df749205..b3d8be9fc7 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -117,7 +117,7 @@ class AuthenticationCookie extends AuthenticationPlugin echo ' <div class="container"> <a href="'; - echo PMA_linkURL('http://www.phpmyadmin.net/'); + echo PMA_linkURL('https://www.phpmyadmin.net/'); echo '" target="_blank" class="logo">'; $logo_image = $GLOBALS['pmaThemeImage'] . 'logo_right.png'; if (@file_exists($logo_image)) { diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php index 7464f030f2..76bbc02dbf 100644 --- a/libraries/plugins/auth/swekey/swekey.auth.lib.php +++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php @@ -271,7 +271,7 @@ function Swekey_login($input_name, $input_go) ?> function open_swekey_site() { - window.open("<?php echo PMA_linkURL('http://phpmyadmin.net/auth_key'); ?>"); + window.open("<?php echo PMA_linkURL('https://www.phpmyadmin.net/auth_key/'); ?>"); } var input_username = document.getElementById("<?php echo $input_name; ?>"); diff --git a/libraries/plugins/export/ExportXml.class.php b/libraries/plugins/export/ExportXml.class.php index 5b62d2271c..7d8048bc40 100644 --- a/libraries/plugins/export/ExportXml.class.php +++ b/libraries/plugins/export/ExportXml.class.php @@ -177,7 +177,7 @@ class ExportXml extends ExportPlugin . '<!--' . $crlf . '- phpMyAdmin XML Dump' . $crlf . '- version ' . PMA_VERSION . $crlf - . '- http://www.phpmyadmin.net' . $crlf + . '- https://www.phpmyadmin.net' . $crlf . '-' . $crlf . '- ' . __('Host:') . ' ' . $cfg['Server']['host']; if (! empty($cfg['Server']['port'])) { diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 9a6a5f3f18..eda069bb1e 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -3211,7 +3211,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir) . '<table id="tableuserrights" class="data">' . "\n" . '<thead>' . "\n" . '<tr><th></th>' . "\n" - . '<th>' . __('User') . '</th>' . "\n" + . '<th>' . __('User name') . '</th>' . "\n" . '<th>' . __('Host') . '</th>' . "\n" . '<th>' . __('Password') . '</th>' . "\n" . '<th>' . __('Global privileges') . ' ' diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php index 33ddeabe40..c2fb9fb0f7 100644 --- a/libraries/user_preferences.lib.php +++ b/libraries/user_preferences.lib.php @@ -279,7 +279,7 @@ function PMA_userprefsAutoloadGetHeader() ); $retval .= '<div id="prefs_autoload" class="notice" style="display:none">'; - $retval .= '<form action="prefs_manage.php" method="post">'; + $retval .= '<form action="prefs_manage.php" method="post" class="disableAjax">'; $retval .= PMA_URL_getHiddenInputs(); $retval .= '<input type="hidden" name="json" value="" />'; $retval .= '<input type="hidden" name="submit_import" value="1" />'; diff --git a/locale/bg/LC_MESSAGES/phpmyadmin.mo b/locale/bg/LC_MESSAGES/phpmyadmin.mo Binary files differindex 77c79ab9bc..b2db024bc9 100644 --- a/locale/bg/LC_MESSAGES/phpmyadmin.mo +++ b/locale/bg/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/da/LC_MESSAGES/phpmyadmin.mo b/locale/da/LC_MESSAGES/phpmyadmin.mo Binary files differindex ff5a95739d..8ec8ba8a14 100644 --- a/locale/da/LC_MESSAGES/phpmyadmin.mo +++ b/locale/da/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/es/LC_MESSAGES/phpmyadmin.mo b/locale/es/LC_MESSAGES/phpmyadmin.mo Binary files differindex 2bfe66806f..f5eb1714d6 100644 --- a/locale/es/LC_MESSAGES/phpmyadmin.mo +++ b/locale/es/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/id/LC_MESSAGES/phpmyadmin.mo b/locale/id/LC_MESSAGES/phpmyadmin.mo Binary files differindex 7e360071e2..e67b8a6925 100644 --- a/locale/id/LC_MESSAGES/phpmyadmin.mo +++ b/locale/id/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/it/LC_MESSAGES/phpmyadmin.mo b/locale/it/LC_MESSAGES/phpmyadmin.mo Binary files differindex 79e98705e0..b0439b5365 100644 --- a/locale/it/LC_MESSAGES/phpmyadmin.mo +++ b/locale/it/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/nb/LC_MESSAGES/phpmyadmin.mo b/locale/nb/LC_MESSAGES/phpmyadmin.mo Binary files differindex bd2817ea48..3296e74ca8 100644 --- a/locale/nb/LC_MESSAGES/phpmyadmin.mo +++ b/locale/nb/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/pt/LC_MESSAGES/phpmyadmin.mo b/locale/pt/LC_MESSAGES/phpmyadmin.mo Binary files differindex e27dbcf221..8c84b1cae9 100644 --- a/locale/pt/LC_MESSAGES/phpmyadmin.mo +++ b/locale/pt/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo b/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo Binary files differindex f2da199219..80d004b9e5 100644 --- a/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo +++ b/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/sk/LC_MESSAGES/phpmyadmin.mo b/locale/sk/LC_MESSAGES/phpmyadmin.mo Binary files differindex 9eb3911d8a..414ce17649 100644 --- a/locale/sk/LC_MESSAGES/phpmyadmin.mo +++ b/locale/sk/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/sl/LC_MESSAGES/phpmyadmin.mo b/locale/sl/LC_MESSAGES/phpmyadmin.mo Binary files differindex 59df614e80..ac086b0d26 100644 --- a/locale/sl/LC_MESSAGES/phpmyadmin.mo +++ b/locale/sl/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/sq/LC_MESSAGES/phpmyadmin.mo b/locale/sq/LC_MESSAGES/phpmyadmin.mo Binary files differindex 8173221459..0533eefce6 100644 --- a/locale/sq/LC_MESSAGES/phpmyadmin.mo +++ b/locale/sq/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/tr/LC_MESSAGES/phpmyadmin.mo b/locale/tr/LC_MESSAGES/phpmyadmin.mo Binary files differindex 5c0b5dd1df..ad806f5ae0 100644 --- a/locale/tr/LC_MESSAGES/phpmyadmin.mo +++ b/locale/tr/LC_MESSAGES/phpmyadmin.mo diff --git a/sql/create_tables_drizzle.sql b/sql/create_tables_drizzle.sql index 4bce72f2d8..12248a5dc1 100644 --- a/sql/create_tables_drizzle.sql +++ b/sql/create_tables_drizzle.sql @@ -272,4 +272,4 @@ CREATE TABLE IF NOT EXISTS `pma__savedsearches` ( UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`) ) COMMENT='Saved searches' - DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; + COLLATE utf8_bin; diff --git a/tbl_get_field.php b/tbl_get_field.php index 1ec3c5a8f9..f4570ebac1 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -49,7 +49,7 @@ if ($result === false) { PMA_downloadHeader( $table . '-' . $_GET['transform_key'] . '.bin', PMA_detectMIME($result), - /*overload*/mb_strlen($result) + /*overload*/mb_strlen($result, '8bit') ); echo $result; ?> diff --git a/themes.php b/themes.php index f0d1be6f09..4e56365d01 100644 --- a/themes.php +++ b/themes.php @@ -18,7 +18,7 @@ $header->setTitle('phpMyAdmin - ' . __('Theme')); $header->disableMenuAndConsole(); $hash = '#pma_' . preg_replace('/([0-9]*)\.([0-9]*)\..*/', '\1_\2', PMA_VERSION); -$url = PMA_linkURL('http://www.phpmyadmin.net/home_page/themes.php') . $hash; +$url = PMA_linkURL('https://www.phpmyadmin.net/themes/') . $hash; $output = '<h1>phpMyAdmin - ' . __('Theme') . '</h1>'; $output .= '<p>'; $output .= '<a href="' . $url . '" class="_blank">'; |