summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Chedemois2009-06-05 20:36:02 (GMT)
committer Yves Chedemois2009-06-05 20:36:02 (GMT)
commit5595ee0016cc510f947fe29e8da3da303e67e075 (patch)
tree300b880de81f4dac3c625d378c82ddbaa84877ba
parent50a46047ee448beb1c376007f5afa34ffef2f945 (diff)
#482774 Update breaks when CCK is disabled.
-rw-r--r--CHANGELOG.txt4
-rw-r--r--content.install5
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d9559dc..194aef3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
//$Id$
+CCK 6.x-2.x
+===========
+- #482774 Update breaks when CCK is disabled.
+
CCK 6.x-2.3
===========
diff --git a/content.install b/content.install
index 94e961d..863e0e6 100644
--- a/content.install
+++ b/content.install
@@ -525,8 +525,13 @@ function content_update_6009() {
* See http://drupal.org/node/407446.
*/
function content_update_6010(&$sandbox) {
+ if ($abort = content_check_update()) {
+ return $abort;
+ }
$ret = array();
+ drupal_load('module', 'content');
+
// Gather list of tables and columns that need to be updated.
if (!isset($sandbox['tables'])) {
$sandbox['tables'] = array();