Merge https://github.com/friendica/red into zpull

2 files changed, 25 insertions, 1 deletions

diff --git a/install/database.sql b/install/database.sql
index ef79862c3..915cecdba 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -1029,3 +1029,11 @@ CREATE TABLE IF NOT EXISTS `xtag` (
   KEY `xtag_hash` (`xtag_hash`),
   KEY `xtag_flags` (`xtag_flags`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE if not exists `sys_perms` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`cat` CHAR( 255 ) NOT NULL ,
+	`k` CHAR( 255 ) NOT NULL ,
+	`v` MEDIUMTEXT NOT NULL,
+	`public_perm` TINYINT( 1 ) UNSIGNED NOT NULL
+) ENGINE = MYISAM DEFAULT CHARSET = utf8");
diff --git a/install/update.php b/install/update.php
index f498ec042..05bddba42 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1084 );
+define( 'UPDATE_VERSION' , 1085 );
 
 /**
  *
@@ -919,3 +919,19 @@ ADD INDEX ( `aid` )");
 	return UPDATE_FAILED;
 }
 
+function update_r1084() {
+
+
+	$r = q("CREATE TABLE if not exists `sys_perms` (
+			`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+			`cat` CHAR( 255 ) NOT NULL ,
+			`k` CHAR( 255 ) NOT NULL ,
+			`v` MEDIUMTEXT NOT NULL,
+			`public_perm` TINYINT( 1 ) UNSIGNED NOT NULL
+) ENGINE = MYISAM DEFAULT CHARSET = utf8");
+
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+
+}