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

Merge branch 'QA_4_8'

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-03-07 00:00:34 +01:00
commit 26963f2f2c
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -48,6 +48,9 @@ phpMyAdmin - ChangeLog
- issue #14832 Show Designer combo boxes when adding a constraint
- issue #14948 Fix change password is not showing password strength difference at the second attempt
- issue #14868 Fix edit view
- issue #14943 Fixed loading Forever when creating new view without filling any field
- issue #14843 Fix Bookmark::get() id matching SQL
- issue #14734 Fixed invalid default value for bit field
4.8.5 (2019-01-25)
- issue Developer debug data was saved to the PHP error log

3
js/functions.js
View File

@ -4605,7 +4605,6 @@ AJAX.registerOnload('functions.js', function () {
function PMA_createViewDialog ($this) {
var $msg = PMA_ajaxShowMessage();
var syntaxHighlighter = null;
var sep = PMA_commonParams.get('arg_separator');
var params = getJSConfirmCommonParam(this, $this.getPostData());
params += sep + 'ajax_dialog=1';
@ -4625,7 +4624,7 @@ function PMA_createViewDialog ($this) {
$('.result_query').html(data.message);
PMA_reloadNavigation();
} else {
PMA_ajaxShowMessage(data.error, false);
PMA_ajaxShowMessage(data.error);
}
});
};

2
libraries/classes/Bookmark.php
View File

@ -377,7 +377,7 @@ class Bookmark
$query .= ")";
}
$query .= " AND " . Util::backquote($id_field)
. " = " . $dbi->escapeString((string) $id) . " LIMIT 1";
. " = '" . $dbi->escapeString((string) $id) . "' LIMIT 1";
$result = $dbi->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL);
if (! empty($result)) {

2
libraries/classes/Util.php
View File

@ -2843,7 +2843,7 @@ class Util
*/
public static function convertBitDefaultValue($bit_default_value)
{
return rtrim(ltrim($bit_default_value, "b'"), "'");
return rtrim(ltrim(htmlspecialchars_decode($bit_default_value, ENT_QUOTES), "b'"), "'");
}
/**

16
templates/view_create.twig
View File

@ -108,16 +108,12 @@
</table>
</fieldset>
{% if ajax_dialog %}
<fieldset class="tblFooters">
<input type="hidden" name="{{ (view['operation'] == 'create') ? 'createview' : 'alterview' }}" value="1">
<input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
</fieldset>
{% else %}
<input type="hidden" name="{{ (view['operation'] == 'create') ? 'createview' : 'alterview' }}" value="1">
<input type="hidden" name="ajax_dialog" value="1">
<input type="hidden" name="ajax_request" value="1">
<input class="btn btn-primary" type="submit" value="{% trans 'Go' %}">
<input type="hidden" name="ajax_request" value="1" />
<input type="hidden" name="{{ (view['operation'] == 'create') ? 'createview' : 'alterview' }}" value="1" />
{% if ajax_dialog == false %}
<input type="hidden" name="ajax_dialog" value="1" />
<input type="submit" name="" value="{% trans 'Go' %}" />
{% endif %}
</form>