- Patch #18018 by dww, nedjo, tostinne, luke et al: block visibility by role.

4 files changed, 59 insertions, 0 deletions

diff --git a/database/database.4.0.mysql b/database/database.4.0.mysql
index dfd96323c..e2a9d0009 100644
--- a/database/database.4.0.mysql
+++ b/database/database.4.0.mysql
@@ -569,6 +569,17 @@ CREATE TABLE role (
 );
 
 --
+-- Table structure for table 'blocks_roles'
+--
+CREATE TABLE blocks_roles (
+  module varchar(64) NOT NULL,
+  delta varchar(32) NOT NULL,
+  rid int(10) unsigned NOT NULL,
+  PRIMARY KEY (module, delta, rid)
+)
+/*!40100 DEFAULT CHARACTER SET utf8 */ ;
+
+--
 -- Table structure for table 'search_dataset'
 --
 CREATE TABLE search_dataset (
diff --git a/database/database.4.1.mysql b/database/database.4.1.mysql
index 8c2c3318f..4518b7224 100644
--- a/database/database.4.1.mysql
+++ b/database/database.4.1.mysql
@@ -608,6 +608,17 @@ CREATE TABLE role (
 DEFAULT CHARACTER SET utf8;
 
 --
+-- Table structure for table 'blocks_roles'
+--
+CREATE TABLE blocks_roles (
+  module varchar(64) NOT NULL,
+  delta varchar(32) NOT NULL,
+  rid int(10) unsigned NOT NULL,
+  PRIMARY KEY (module, delta, rid)
+)
+/*!40100 DEFAULT CHARACTER SET utf8 */ ;
+
+--
 -- Table structure for table 'search_dataset'
 --
 CREATE TABLE search_dataset (
diff --git a/database/database.pgsql b/database/database.pgsql
index 7d468f82b..a2812b604 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -572,6 +572,17 @@ CREATE TABLE role (
 );
 
 --
+-- Table structure for table 'blocks_roles'
+--
+
+CREATE TABLE blocks_roles (
+  module varchar(64) NOT NULL,
+  delta varchar(32) NOT NULL,
+  rid integer NOT NULL,
+  PRIMARY KEY (module, delta, rid)
+);
+
+--
 -- Table structure for table 'search_dataset'
 --
 CREATE TABLE search_dataset (
diff --git a/database/updates.inc b/database/updates.inc
index 0e357850f..d641da08b 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -2014,3 +2014,29 @@ function system_update_182() {
 
   return $ret;
 }
+
+function system_update_183() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+    $ret[] = update_sql("CREATE TABLE blocks_roles (
+      module varchar(64) NOT NULL,
+      delta varchar(32) NOT NULL,
+      rid int(10) unsigned NOT NULL,
+      PRIMARY KEY (module, delta, rid)
+      ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
+    break;
+
+    case 'pgsql':
+    $ret[] = update_sql("CREATE TABLE blocks_roles (
+      module varchar(64) NOT NULL,
+      delta varchar(32) NOT NULL,
+      rid integer NOT NULL,
+      PRIMARY KEY (module, delta, rid)
+      );");
+    break;
+
+  }
+  return $ret;
+}