Merge branch 'QA_4_4'

Conflicts:
	libraries/db_designer.lib.php

ChangeLog

@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 + rfe #689  Column privileges and update
 
 4.4.11.0 (not yet released)
+- bug       Missing selected/entered values when editing active options in visual query builder
 
 4.4.10.0 (2015-06-17)
 - bug #4950 Issues in database selection for replication

js/pmd/history.js

@@ -191,6 +191,7 @@ function history_edit(index)
         document.getElementById('query_having').style.display = 'block';
     }
     if (type == "Rename") {
+        document.getElementById('e_rename').value = history_array[index].get_obj().getrename_to();
         document.getElementById('query_rename_to').style.left =  '530px';
         document.getElementById('query_rename_to').style.top  = '130px';
         document.getElementById('query_rename_to').style.position  = 'absolute';
@@ -199,6 +200,7 @@ function history_edit(index)
         document.getElementById('query_rename_to').style.display = 'block';
     }
     if (type == "Aggregate") {
+        document.getElementById('e_operator').value = history_array[index].get_obj().get_operator();
         document.getElementById('query_Aggregate').style.left = '530px';
         document.getElementById('query_Aggregate').style.top  = '130px';
         document.getElementById('query_Aggregate').style.position  = 'absolute';

templates/designer/aggregate_query_panel.phtml

@@ -46,7 +46,7 @@
                                     <option value="avg">
                                         AVG
                                     </option>
-                                    <option value="avg">
+                                    <option value="count">
                                         COUNT
                                     </option>
                                 </select>