aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-14 18:02:34 -0700
committerfriendica <info@friendica.com>2014-10-14 18:02:34 -0700
commit2db7d88e285f2deb6d75d961bccfa396cd4eaae6 (patch)
treea32df171e9ab09c63e7a582db9f589c73fa3527d
parent903f7e73fbc9a36c0a073ff1c9f05555a030a34e (diff)
downloadvolse-hubzilla-2db7d88e285f2deb6d75d961bccfa396cd4eaae6.tar.gz
volse-hubzilla-2db7d88e285f2deb6d75d961bccfa396cd4eaae6.tar.bz2
volse-hubzilla-2db7d88e285f2deb6d75d961bccfa396cd4eaae6.zip
this is the reason Diaspora forum tagging was broken
-rwxr-xr-xboot.php2
-rw-r--r--include/identity.php7
-rw-r--r--install/update.php9
-rw-r--r--version.inc2
4 files changed, 14 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index 563ed0fe1..1824e792f 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ define ( 'RED_PLATFORM', 'redmatrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1129 );
+define ( 'DB_UPDATE_VERSION', 1130 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/include/identity.php b/include/identity.php
index 4417f4028..07bfaebbd 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -291,8 +291,8 @@ function create_identity($arr) {
// Create a verified hub location pointing to this site.
$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags,
- hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey )
- values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s' )",
+ hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
+ values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
dbesc($guid),
dbesc($sig),
dbesc($hash),
@@ -302,7 +302,8 @@ function create_identity($arr) {
dbesc(base64url_encode(rsa_sign(z_root(),$ret['channel']['channel_prvkey']))),
dbesc(get_app()->get_hostname()),
dbesc(z_root() . '/post'),
- dbesc(get_config('system','pubkey'))
+ dbesc(get_config('system','pubkey')),
+ dbesc('zot')
);
if(! $r)
logger('create_identity: Unable to store hub location');
diff --git a/install/update.php b/install/update.php
index 0b1fa5d2e..18729f581 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1129 );
+define( 'UPDATE_VERSION' , 1130 );
/**
*
@@ -1457,3 +1457,10 @@ function update_r1128() {
}
+function update_r1129() {
+ $r = q("update hubloc set hubloc_network = 'zot' where hubloc_network = '');
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+
diff --git a/version.inc b/version.inc
index f25d8bb18..1984d7bf1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-10-13.827
+2014-10-14.828