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

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2017-07-18 11:26:36 +02:00
commit 0cd143f274
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/codemirror/addon/lint/sql-lint.js vendored
View File

@ -16,7 +16,7 @@ CodeMirror.sqlLint = function(text, updateLinting, options, cm) {
to: CodeMirror.Pos(
response[idx].toLine, response[idx].toColumn
),
message_html: response[idx].message,
messageHTML: response[idx].message,
severity : response[idx].severity
});
}

4
js/vendor/codemirror/addon/lint/lint.js vendored
View File

@ -116,8 +116,8 @@
* The HTML support is patched, submitted upstream at
* https://github.com/codemirror/CodeMirror/pull/4861
*/
if (typeof ann.message_html != 'undefined') {
tip.innerHTML = ann.message_html;
if (typeof ann.messageHTML != 'undefined') {
tip.innerHTML = ann.messageHTML;
} else {
tip.appendChild(document.createTextNode(ann.message));
}