Conflicts:

	CHANGELOG.txt

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d9afc40..729af0b 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,5 @@
 Nodewords 6.x-1-dev, xxxx-xx-xx
---------------------------
+#681080 by kiamlaluno: Update function changes the field id into a smallint.
 #672068 by suvisor, kiamlaluno: Update fails passing from 6.x-1.3 to 6.x-1.11.
 #679466 by kiamlaluno: Update from Nodewords 6.x-1.3-alpha2 to 6.x-1.11 fails because of Update #6151.
 #675110 by kiamlaluno: Add '#wysiwyg' => FALSE to textareas.

diff --git a/nodewords.admin.inc b/nodewords.admin.inc
index dcc81d1..4a18ea1 100644 (file)
--- a/nodewords.admin.inc
+++ b/nodewords.admin.inc
@@ -23,9 +23,8 @@ function nodewords_pages_confirm_delete(&$form_state, $page) {
   return confirm_form($form,
     t('Are you sure you want to delete the meta tags for the page %name?', array('%name' => $page->name)),
     'admin/content/nodewords/meta-tags/other',
-    t('This action cannot be undone.'),
-    t('Delete'),
-    t('Cancel')
+    NULL,
+    t('Delete')
   );
 }
 

diff --git a/nodewords.install b/nodewords.install
index 5be952a..e03f6fd 100644 (file)
--- a/nodewords.install
+++ b/nodewords.install
@@ -1251,47 +1251,6 @@ function nodewords_update_6161(&$sandbox) {
 /**
  * Implements hook_update_N().
  */
-function nodewords_update_6162() {
-  $ret = array();
-
-  db_drop_index($ret, 'nodewords', 'nodewords_type_id');
-  db_drop_unique_key($ret, 'nodewords', 'nodewords_type_id_name');
-
-  db_change_field($ret, 'nodewords', 'type', 'type',
-    array(
-      'type' => 'int',
-      'size' => 'small',
-      'unsigned' => TRUE,
-      'not null' => TRUE,
-      'default' => 0,
-    )
-  );
-
-  db_change_field($ret, 'nodewords', 'id', 'id',
-    array(
-      'type' => 'int',
-      'size' => 'small',
-      'unsigned' => TRUE,
-      'not null' => TRUE,
-      'default' => 0,
-    )
-  );
-
-  db_add_index($ret, 'nodewords', 'nodewords_type_id',
-    array('type', 'id')
-  );
-  db_add_unique_key($ret, 'nodewords', 'nodewords_type_id_name',
-    array('type', 'id', 'name')
-  );
-
-  variable_set('nodewords_update_6162', TRUE);
-
-  return $ret;
-}
-
-/**
- * Implements hook_update_N().
- */
 function nodewords_update_6164() {
   $node_types = array_keys(node_get_types('names'));
   $ret = array();
@@ -1479,6 +1438,46 @@ function nodewords_update_6169() {
 }
 
 /**
+ * Implements hook_update_N().
+ */
+function nodewords_update_6169() {
+  $ret = array();
+
+  db_drop_index($ret, 'nodewords', 'nodewords_type_id');
+  db_drop_unique_key($ret, 'nodewords', 'nodewords_type_id_name');
+
+  db_change_field($ret, 'nodewords', 'type', 'type',
+    array(
+      'type' => 'int',
+      'size' => 'small',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+    )
+  );
+
+  db_change_field($ret, 'nodewords', 'id', 'id',
+    array(
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+    )
+  );
+
+  db_add_index($ret, 'nodewords', 'nodewords_type_id',
+    array('type', 'id')
+  );
+  db_add_unique_key($ret, 'nodewords', 'nodewords_type_id_name',
+    array('type', 'id', 'name')
+  );
+
+  variable_set('nodewords_update', 6169);
+
+  return $ret;
+}
+
+/**
  * Implements hook_uninstall().
  */
 function nodewords_uninstall() {