- Patch #225450 by Crell, chx, bjaspan, catch, swentel, recidive et al: next generation database layer for Drupal 7.

3 files changed, 7 insertions, 4 deletions

diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 7c1bf0519..d4e110801 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -606,11 +606,11 @@ function _system_is_incompatible(&$incompatible, $files, $file) {
  */
 function system_modules($form_state = array()) {
   // Clear all caches.
+  registry_rebuild();
   drupal_theme_rebuild();
   node_types_rebuild();
   menu_rebuild();
   cache_clear_all('schema', 'cache');
-
   // Get current list of modules.
   $files = module_rebuild_cache();
 
@@ -677,6 +677,9 @@ function system_modules($form_state = array()) {
         $extra['dependents'][] = $files[$dependent]->info['name'] . t(' (<span class="admin-disabled">disabled</span>)');
       }
     }
+    if (!isset($module->info['package'])) {
+      $module->info['package'] = 'Other';
+    }
     $form['modules'][$module->info['package']][$filename] = _system_modules_build_row($module->info, $extra);
   }
   // Add basic information to the fieldsets.
@@ -2245,4 +2248,4 @@ function theme_system_themes_form($form) {
   $output = theme('table', $header, $rows);
   $output .= drupal_render($form);
   return $output;
-}
\ No newline at end of file
+}
diff --git a/modules/system/system.install b/modules/system/system.install
index 91a1c23f1..fc28922ed 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -303,7 +303,7 @@ function system_requirements($phase) {
  * Implementation of hook_install().
  */
 function system_install() {
-  if ($GLOBALS['db_type'] == 'pgsql') {
+  if (db_driver() == 'pgsql') {
     // We create some custom types and functions using global names instead of
     // prefixing them like we do with table names. If this function is ever
     // called again (for example, by the test framework when creating prefixed
diff --git a/modules/system/system.module b/modules/system/system.module
index 9b79eb9e5..e375201db 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1123,7 +1123,7 @@ function system_region_list($theme_key) {
   static $list = array();
 
   if (!array_key_exists($theme_key, $list)) {
-    $info = unserialize(db_result(db_query("SELECT info FROM {system} WHERE type = 'theme' AND name = '%s'", $theme_key)));
+    $info = unserialize(db_result(db_query("SELECT info FROM {system} WHERE type = :type AND name = :name", array(':type' => 'theme', ':name' => $theme_key))));
     $list[$theme_key] = array_map('t', $info['regions']);
   }