diff options
| author | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-02-27 14:32:38 +0000 |
|---|---|---|
| committer | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-02-27 14:32:38 +0000 |
| commit | 29170c88f2a328b222052bf007a51d9769412062 (patch) | |
| tree | 101684c7ea1ba5840c56088da0d599f62e1131db /modules/system.module | |
| parent | 1091a2f05917f3a733d5cb0c67238dec8940e464 (diff) | |
| download | brdo-29170c88f2a328b222052bf007a51d9769412062.tar.gz brdo-29170c88f2a328b222052bf007a51d9769412062.tar.bz2 | |
#48025, System table not updated when moving modules, patch by grugnog, changed variable name to match conventions.
Diffstat (limited to 'modules/system.module')
| -rw-r--r-- | modules/system.module | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/system.module b/modules/system.module index 494c9fa5f..c0ea905ed 100644 --- a/modules/system.module +++ b/modules/system.module @@ -510,9 +510,10 @@ function system_cron_settings() { */ function system_get_files_database(&$files, $type) { // Extract current files from database. - $result = db_query("SELECT name, type, status, throttle, schema_version FROM {system} WHERE type = '%s'", $type); + $result = db_query("SELECT filename, name, type, status, throttle, schema_version FROM {system} WHERE type = '%s'", $type); while ($file = db_fetch_object($result)) { if (isset($files[$file->name]) && is_object($files[$file->name])) { + $file->old_filename = $file->filename; foreach ($file as $key => $value) { if (!isset($files[$file->name]) || !isset($files[$file->name]->$key)) { $files[$file->name]->$key = $value; @@ -919,8 +920,8 @@ function system_modules() { } // Update the contents of the system table: - if (isset($file->status)) { - db_query("UPDATE {system} SET description = '%s', name = '%s', bootstrap = %d WHERE filename = '%s'", $file->description, $file->name, $bootstrap, $file->filename); + if (isset($file->status) || $file->old_filename != $file->filename) { + db_query("UPDATE {system} SET description = '%s', name = '%s', bootstrap = %d, filename = '%s' WHERE filename = '%s'", $file->description, $file->name, $bootstrap, $file->filename, $file->old_filename); } else { // This is a new module. |