aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-05 16:11:39 -0800
committerfriendica <info@friendica.com>2012-02-05 16:11:39 -0800
commit03956cef3399e0acb91878b8dcb578a960609e8f (patch)
treef2620087e7d9f9d1811d00a5868887de422e73c7
parenta8163a6eaf5f63e1e83aa68191a0559b5d936acc (diff)
parentb12e598dba54c81a8d91d7fbd5f68922099585e1 (diff)
downloadvolse-hubzilla-03956cef3399e0acb91878b8dcb578a960609e8f.tar.gz
volse-hubzilla-03956cef3399e0acb91878b8dcb578a960609e8f.tar.bz2
volse-hubzilla-03956cef3399e0acb91878b8dcb578a960609e8f.zip
Merge branch 'master' into spam
-rwxr-xr-xboot.php2
-rwxr-xr-xupdate.php7
2 files changed, 5 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index fc53a026d..a861dff67 100755
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1243' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
-define ( 'DB_UPDATE_VERSION', 1119 );
+define ( 'DB_UPDATE_VERSION', 1120 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/update.php b/update.php
index d0fe1645b..dc3cc0e56 100755
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1119 );
+define( 'UPDATE_VERSION' , 1120 );
/**
*
@@ -1013,10 +1013,11 @@ INDEX ( `mid` )
}
function update_1118() {
-q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTER `reason` , ADD INDEX (`closensss`) ");
-q("update contact set closeness = 0 where self = 1");
+ // rolled forward
}
function update_1119() {
+q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTER `reason` , ADD INDEX (`closeness`) ");
+q("update contact set closeness = 0 where self = 1");
q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
}