Final part of the fix for #646544: update block cache values in the database

diff --git a/print.install b/print.install
index 3b3b307..d12fb71 100644 (file)
--- a/print.install
+++ b/print.install
@@ -306,3 +306,15 @@ function print_update_6003() {
   menu_rebuild();
   return $ret;
 }
+
+/**
+ * Update to version 6.x-1.11
+ */
+function print_update_6004() {
+  $ret = array();
+  // BLOCK_CACHE_PER_PAGE -> 4
+  $ret[] = update_sql("UPDATE {blocks} SET cache = 4 WHERE module = 'print' AND delta = 0");
+  // BLOCK_CACHE_GLOBAL -> 8
+  $ret[] = update_sql("UPDATE {blocks} SET cache = 8 WHERE module = 'print' AND delta = 1");
+  return $ret;
+}

diff --git a/print_mail/print_mail.install b/print_mail/print_mail.install
index 2d5d99f..d10eafa 100644 (file)
--- a/print_mail/print_mail.install
+++ b/print_mail/print_mail.install
@@ -267,3 +267,13 @@ function print_mail_update_6004() {
   }
   return $ret;
 }
+
+/**
+ * Update to version 6.x-1.11
+ */
+function print_mail_update_6005() {
+  $ret = array();
+  // BLOCK_CACHE_GLOBAL -> 8
+  $ret[] = update_sql("UPDATE {blocks} SET cache = 8 WHERE module = 'print_mail' AND delta = 0");
+  return $ret;
+}

diff --git a/print_pdf/print_pdf.install b/print_pdf/print_pdf.install
index ffefcf9..32283b5 100644 (file)
--- a/print_pdf/print_pdf.install
+++ b/print_pdf/print_pdf.install
@@ -47,9 +47,6 @@ function print_pdf_uninstall() {
   while ($variable = db_fetch_object($settings)) {
     variable_del($variable->name);
   }
-
-  variable_del('print_pdf_wkhtmltopdf_xdisplay');
-  variable_del('print_pdf_xvfb_options');
 }
 
 /**
@@ -244,3 +241,17 @@ function print_pdf_update_6004() {
   }
   return $ret;
 }
+
+/**
+ * Update to version 6.x-1.11
+ */
+function print_pdf_update_6005() {
+  $ret = array();
+
+  variable_del('print_pdf_wkhtmltopdf_xdisplay');
+  variable_del('print_pdf_xvfb_options');
+
+  // BLOCK_CACHE_GLOBAL -> 8
+  $ret[] = update_sql("UPDATE {blocks} SET cache = 8 WHERE module = 'print_pdf' AND delta = 0");
+  return $ret;
+}