diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-28 16:02:51 -0700 |
| commit | bc74425872704ad955b37de18639ec831a245761 (patch) | |
| tree | a72a058190905f6f87488d51a97ce02df00f7422 /install | |
| parent | 35f17acb388f68745068d6a60e12c7b777b92282 (diff) | |
| download | volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.gz volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.tar.bz2 volse-hubzilla-bc74425872704ad955b37de18639ec831a245761.zip | |
Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge"
This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing
changes made to 58cf5f310d89026fb526e201c301075725044e48.
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 1 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 1 | ||||
| -rw-r--r-- | install/update.php | 29 |
3 files changed, 2 insertions, 29 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 5e5b9d5be..5335c231e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -920,7 +920,6 @@ CREATE TABLE IF NOT EXISTS `pconfig` ( UNIQUE KEY `access` (`uid`,`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `photo` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 44711c190..1a770d4ff 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -903,7 +903,6 @@ CREATE TABLE "pconfig" ( PRIMARY KEY ("id"), UNIQUE ("uid","cat","k") ); - CREATE TABLE "photo" ( "id" serial NOT NULL, "aid" bigint NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index 3d0e5b00d..f2d97430b 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1181 ); +define( 'UPDATE_VERSION' , 1180 ); /** * @@ -2402,30 +2402,5 @@ function update_r1179() { return UPDATE_SUCCESS; return UPDATE_FAILED; -} - -function update_r1180() { - - require_once('include/perm_upgrade.php'); - - $r1 = q("select * from channel where true"); - if($r1) { - foreach($r1 as $rr) { - perm_limits_upgrade($rr); - autoperms_upgrade($rr); - } - } - - $r2 = q("select * from abook where true"); - if($r2) { - foreach($r2 as $rr) { - perm_abook_upgrade($rr); - } - } - - $r = $r1 && $r2; - if($r) - return UPDATE_SUCCESS; - return UPDATE_FAILED; -} +}
\ No newline at end of file |