Merge branch 'QA_4_2'

2014-07-30 10:42:00 -04:00 · 2014-07-30 10:42:00 -04:00 · ebb3ebea76
commit ebb3ebea76
parent c58a9b8ed0 b3f2c433fc
2 changed files with 5 additions and 0 deletions
--- a/1
+++ b/1
@ -34,6 +34,7 @@ phpMyAdmin - ChangeLog
 - bug #4493 s_attention.png is missing
 - bug #4499 Uncaught TypeError: Cannot call method 'substr' of undefined
 - bug #4498 PMA 4.2.x and HHVM
+- bug #4500 mysql_doc_template is not defined

 4.2.6.0 (2014-07-17)
 - bug #4471 Undefined index warning with referenced column.
--- a/js/functions.js
+++ b/js/functions.js
@ -1624,6 +1624,10 @@ function catchKeypressesFromSqlTextboxes(event) {
 */
 function PMA_doc_add($elm, params)
 {
+    if (typeof mysql_doc_template == 'undefined') {
+        return;
+    }
+
    var url = $.sprintf(
        mysql_doc_template,
        params[0]