gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Madhura Jayaratne 2014-05-18 14:11:56 +05:30
commit 117490393a
13 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -3,10 +3,16 @@ phpMyAdmin - ChangeLog
4.2.2.0 (not yet released)
- bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree
- bug #4414 table display of performance_schema DB structure
- bug #4411 Protect Binary Columns: many problems
- bug #4395 BLOB link transformation is broken
- bug Respect ['ShowCreateDb'] in the navi panel
- bug #4392 Cannot see databases in nav panel on databases grouping when disabled database expansion
- bug #4419 No more calendar into search tab
- bug #4398 Monitor should fit into screen width
4.2.1.0 (2014-05-13)
- bug #4380 Cannot display table structure with enums containing special characters
- bug #4380 Cannot display table structure with enums containing special characters
- bug #4381 Cannot remove the last remembered sorted column
- bug Correctly fetch length of user and host fields in MySQL tables
- bug #4364 examples/signon.php does not support the SessionSavePath directive

19
js/server_status_monitor.js
View File

@ -1290,10 +1290,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
}
function PMA_getLogAnalyseDialog(min, max) {
$('#logAnalyseDialog input[name="dateStart"]')
.val(PMA_formatDateTime(min, true));
$('#logAnalyseDialog input[name="dateEnd"]')
.val(PMA_formatDateTime(max, true));
var $dateStart = $('#logAnalyseDialog input[name="dateStart"]');
var $dateEnd = $('#logAnalyseDialog input[name="dateEnd"]');
$dateStart.val(PMA_formatDateTime(min, true));
$dateEnd.val(PMA_formatDateTime(max, true));
var dlgBtns = { };
@ -1312,6 +1312,17 @@ AJAX.registerOnload('server_status_monitor.js', function () {
height: 'auto',
buttons: dlgBtns
});
PMA_addDatepicker($dateStart, 'datetime', {
showMillisec: false,
showMicrosec: false,
timeFormat: 'HH:mm:ss'
});
PMA_addDatepicker($dateEnd, 'datetime', {
showMillisec: false,
showMicrosec: false,
timeFormat: 'HH:mm:ss'
});
}
function loadLog(type, min, max) {

4
libraries/TableSearch.class.php
View File

@ -986,7 +986,9 @@ EOT;
$html_output .= '<td>' . $properties['type'] . '</td>';
$html_output .= '<td>' . $properties['collation'] . '</td>';
$html_output .= '<td>' . $properties['func'] . '</td>';
$html_output .= '<td>' . $properties['value'] . '</td>';
// here, the data-type attribute is needed for a date/time picker
$html_output .= '<td data-type="' . $properties['type'] . '"'
. '>' . $properties['value'] . '</td>';
$html_output .= '</tr>';
//Displays hidden fields
$html_output .= '<tr><td>';

6
libraries/insert_edit.lib.php
View File

@ -1099,9 +1099,9 @@ function PMA_getBinaryAndBlobColumn(
$vkey, $is_upload
) {
$html_output = '';
if (($GLOBALS['cfg']['ProtectBinary'] && $column['is_blob'])
|| ($GLOBALS['cfg']['ProtectBinary'] == 'all' && $column['is_binary'])
|| ($GLOBALS['cfg']['ProtectBinary'] == 'noblob' && !$column['is_blob'])
if (($GLOBALS['cfg']['ProtectBinary'] === 'blob' && $column['is_blob'])
|| ($GLOBALS['cfg']['ProtectBinary'] === 'all')
|| ($GLOBALS['cfg']['ProtectBinary'] === 'noblob' && !$column['is_blob'])
) {
$html_output .= __('Binary - do not edit');
if (isset($data)) {

2
libraries/navigation/NavigationTree.class.php
View File

@ -544,7 +544,7 @@ class PMA_NavigationTree
*/
public function groupNode($node)
{
if ($node->type != Node::CONTAINER) {
if ($node->type != Node::CONTAINER || $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
return;
}

4
libraries/navigation/Nodes/Node_Database_Container.class.php
View File

@ -29,7 +29,9 @@ class Node_Database_Container extends Node
{
parent::__construct($name, Node::CONTAINER);
if ($GLOBALS['is_create_db_priv']) {
if ($GLOBALS['is_create_db_priv']
&& $GLOBALS['cfg']['ShowCreateDb'] !== false
) {
$new = PMA_NodeFactory::getInstance(
'Node', _pgettext('Create new database', 'New')
);

5
libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
View File

@ -45,8 +45,11 @@ abstract class ImageLinkTransformationsPlugin extends TransformationsPlugin
*/
public function applyTransformation($buffer, $options = array(), $meta = '')
{
// must disable the page loader, see
// https://wiki.phpmyadmin.net/pma/Page_loader#Bypassing_the_page_loader
$transform_options = array (
'string' => '<a href="transformation_wrapper.php'
'string' => '<a class="disableAjax"'
. ' target="_new" href="transformation_wrapper.php'
. $options['wrapper_link'] . '" alt="[__BUFFER__]">[BLOB]</a>'
);
return PMA_Transformation_globalHtmlReplace(

4
libraries/structure.lib.php
View File

@ -181,7 +181,7 @@ function PMA_getHtmlBodyForTableSummary($num_tables, $server_slave_status,
if ($server_slave_status) {
$html_output .= '<th>' . __('Replication') . '</th>' . "\n";
}
$html_output .= '<th colspan="' . ($db_is_system_schema ? 3 : 7) . '">'
$html_output .= '<th colspan="' . ($db_is_system_schema ? 4 : 7) . '">'
. __('Sum')
. '</th>';
$html_output .= '<th class="value tbl_rows">'
@ -750,7 +750,7 @@ function PMA_tableHeader($db_is_system_schema = false, $replication = false)
$cnt = 0; // Let's count the columns...
if ($db_is_system_schema) {
$action_colspan = 3;
$action_colspan = 4;
} else {
$action_colspan = 7;
}

4
po/pt_BR.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.2.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-04-24 14:50-0400\n"
"PO-Revision-Date: 2014-05-10 20:26+0200\n"
"PO-Revision-Date: 2014-05-14 20:18+0200\n"
"Last-Translator: Edie Johnny <edie.eu@gmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"<https://l10n.cihar.com/projects/phpmyadmin/4-2/pt_BR/>\n"
@ -2031,7 +2031,7 @@ msgid ""
"Warning: a form on this page has more than %d fields. On submission, some of "
"the fields might be ignored, due to PHP's max_input_vars configuration."
msgstr ""
"Aviso: um formulário nesta páginas tem mais de %d campos. Ao enviar, alguns "
"Aviso: um formulário nesta página tem mais de %d campos. Ao enviar, alguns "
"campos podem ser ignorados, por causa da configuração max_input_vars do PHP."
#. l10n: Display text for calendar close link

13
po/sv.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.2.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-04-24 13:06-0400\n"
"PO-Revision-Date: 2014-04-28 14:22+0200\n"
"PO-Revision-Date: 2014-05-15 01:04+0200\n"
"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
"Language-Team: Swedish <https://l10n.cihar.com/projects/phpmyadmin/4-2/sv/>\n"
"Language: sv\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 1.9-dev\n"
"X-Generator: Weblate 1.9\n"
#: changelog.php:36 license.php:28
#, php-format
@ -1591,11 +1591,11 @@ msgstr "Döp om databaser"
#: js/messages.php:241
msgid "Copying Database"
msgstr "Kopiera databas"
msgstr "Kopierar databas"
#: js/messages.php:242
msgid "Changing Charset"
msgstr "Ändra teckenuppsättning"
msgstr "Ändrar teckenuppsättning"
#: js/messages.php:246 libraries/mult_submits.lib.php:432
msgid "Foreign key check:"
@ -9161,7 +9161,7 @@ msgstr "Visa/dölj navigationsobjekt"
#: libraries/relation.lib.php:290
msgid "Saving Query-By-Example searches"
msgstr ""
msgstr "Sparar Query-By-Example-sökningar"
#: libraries/relation.lib.php:296
msgid "Quick steps to setup advanced features:"
@ -12976,12 +12976,11 @@ msgstr ""
"phpMyAdmin kunde inte döda tråd %s. Troligtvis har den redan avslutats."
#: setup/frames/form.inc.php:25
#, fuzzy
#| msgid ""
#| "Incorrect formset, check $formsets array in setup/frames/form.inc.php"
msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php!"
msgstr ""
"Felaktigt formset, kontrollera $formsets matris i setup/frames/form.inc.php"
"Felaktigt formset, kontrollera arrayen $formsets i setup/frames/form.inc.php!"
#: setup/frames/index.inc.php:53
msgid "Cannot load or save configuration"

16
po/th.po
View File

@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.2.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-04-24 14:50-0400\n"
"PO-Revision-Date: 2014-03-27 15:15+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Thai <https://l10n.cihar.com/projects/phpmyadmin/master/th/>\n"
"PO-Revision-Date: 2014-05-17 07:11+0200\n"
"Last-Translator: Sorawee Porncharoenwase <nullzero.free@gmail.com>\n"
"Language-Team: Thai <https://l10n.cihar.com/projects/phpmyadmin/4-2/th/>\n"
"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 1.9-dev\n"
"X-Generator: Weblate 1.9\n"
#: changelog.php:36 license.php:28
#, php-format
@ -675,13 +675,15 @@ msgstr "ที่คั่นหน้า %s ได้ถูกสร้าง
#: import.php:577
#, php-format
msgid "Import has been successfully finished, %d queries executed."
msgstr "นำเข้าได้สำเร็จ %d ได้ถูกนำเดินการแล้ว"
msgstr "นำเข้าสำเร็จเรียบร้อย การสอบถาม %d รายการได้ถูกดำเนินการแล้ว"
#: import.php:598
msgid ""
"Script timeout passed, if you want to finish import, please resubmit same "
"file and import will resume."
msgstr "หมดเวลาการนำเข้าสริปแล้ว กรุณานำเข้าไฟล์สริปใหม่"
msgstr ""
"หมดเวลาการนำเข้าแล้ว หากคุณต้องการดำเนินการต่อให้เรียบร้อย "
"กรุณานำเข้าไฟล์เดิมอีกรอบ"
#: import.php:602
msgid ""

3
test/classes/plugin/transformations/Image_Link_test.php
View File

@ -123,7 +123,8 @@ class Image_JPEG_Link_Test extends PHPUnit_Framework_TestCase
{
$buffer = "PMA_IMAGE_LINK";
$options = array("./image/", "200", "wrapper_link"=>"PMA_wrapper_link");
$result = '<a href="transformation_wrapper.phpPMA_wrapper_link"'
$result = '<a class="disableAjax" target="_new"'
. ' href="transformation_wrapper.phpPMA_wrapper_link"'
. ' alt="PMA_IMAGE_LINK">[BLOB]</a>';
$this->assertEquals(
$result,

2
test/libraries/PMA_insert_edit_test.php
View File

@ -1127,7 +1127,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
*/
public function testGetBinaryAndBlobColumn()
{
$GLOBALS['cfg']['ProtectBinary'] = true;
$GLOBALS['cfg']['ProtectBinary'] = 'blob';
$column['is_blob'] = true;
$column['Field_md5'] = '123';
$column['pma_type'] = 'blob';