Format code - refs #6715

main/inc/lib/plugin.lib.php

@@ -180,15 +180,17 @@ class AppPlugin
         } else {
             $urlId = intval($urlId);
         }
-        api_delete_settings_params(
+        // First call the custom uninstall to allow full access to global settings
-            array('category = ? AND access_url = ? AND subkey = ? ' => array('Plugins', $urlId, $pluginName))
-        );
         $pluginPath = api_get_path(SYS_PLUGIN_PATH).$pluginName.'/uninstall.php';
         if (is_file($pluginPath) && is_readable($pluginPath)) {
             // Execute the uninstall procedure.
 
             require $pluginPath;
         }
+        // Second remove all remaining global settings
+        api_delete_settings_params(
+            array('category = ? AND access_url = ? AND subkey = ? ' => array('Plugins', $urlId, $pluginName))
+        );
     }
 
     /**

plugin/ticket/src/ticket.class.php

@@ -34,8 +34,9 @@ class TicketManager
                         TABLE_TICKET_PROJECT
         );
         $sql = "SELECT category.*, project.other_area , project.email
-            FROM " . $table_support_category . "  category," . $table_support_project . " project
+                FROM $table_support_category category, $table_support_project project
-            WHERE project.project_id = category.project_id ORDER BY category.total_tickets DESC;";
+                WHERE project.project_id = category.project_id 
+                ORDER BY category.total_tickets DESC;";
         $result = Database::query($sql);
         $types = array();
         while ($row = Database::fetch_assoc($result)) {