Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 4, 2015 · c22d0c0 · c22d0c0
2 parents a3688b6 + d113704
commit c22d0c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 4.4.2.0 (not yet released)
 - bug #4835 PMA_hideShowConnection not called after submit_num_fields
 - bug #4836 Server warning after moving from console to direct clicks
+- bug #4837 Duplicate new version notification when using the "Back" button 
 
 4.4.1.0 (not yet released)
 - bug #4813 MySQL 5.7.6 and the Users menu tab

diff --git a/js/functions.js b/js/functions.js
@@ -276,7 +276,8 @@ function PMA_current_version(data)
                 /* Security update */
                 htmlClass = 'error';
             }
-            $('#maincontainer').after('<div class="' + htmlClass + '">' + message + '</div>');
+            $('#newer_version_notice').remove();
+            $('#maincontainer').after('<div id="newer_version_notice" class="' + htmlClass + '">' + message + '</div>');
         }
         if (latest === current) {
             version_information_message = ' (' + PMA_messages.strUpToDate + ')';