aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-06-01 01:30:34 -0700
committerfriendica <info@friendica.com>2014-06-01 01:30:34 -0700
commit3821efb99ed2377f5380bf37a0a1ac3412d08c82 (patch)
treeea8df4e7cb1d917a783659f49efbb6058c481b72
parentc459b5b6354e12d26a8eb651883a63e3e466ba6d (diff)
downloadvolse-hubzilla-3821efb99ed2377f5380bf37a0a1ac3412d08c82.tar.gz
volse-hubzilla-3821efb99ed2377f5380bf37a0a1ac3412d08c82.tar.bz2
volse-hubzilla-3821efb99ed2377f5380bf37a0a1ac3412d08c82.zip
issue #477
-rw-r--r--include/event.php4
-rw-r--r--install/INSTALL.txt6
-rw-r--r--version.inc2
3 files changed, 8 insertions, 4 deletions
diff --git a/include/event.php b/include/event.php
index 0f337867c..107b15427 100644
--- a/include/event.php
+++ b/include/event.php
@@ -391,7 +391,7 @@ function event_store_item($arr,$event) {
if(! $arr['mid'])
$arr['mid'] = item_message_id();
-
+ $item_arr['aid'] = $z[0]['channel_account_id'];
$item_arr['uid'] = $arr['uid'];
$item_arr['author_xchan'] = $arr['event_xchan'];
$item_arr['mid'] = $arr['mid'];
@@ -409,7 +409,7 @@ function event_store_item($arr,$event) {
$item_arr['verb'] = ACTIVITY_POST;
$item_arr['resource_type'] = 'event';
- $item_arr['resource_id'] = $hash;
+ $item_arr['resource_id'] = $event['event_hash'];
$item_arr['obj_type'] = ACTIVITY_OBJ_EVENT;
$item_arr['body'] = format_event_bbcode($arr);
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 74c90826d..6080ff6c7 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -49,8 +49,12 @@ by the internet browser of users they get a warning message complaining about
some security issues. Although these complains are not the real truth - there
are no security issues with your encryption! - the users may be confused,
nerved or even worse may become scared about Red Matrix having security issues.
-Use one of the free certification instances!
+Free "browser-valid" certificates are available from providers such as StartSSL.
+If you do NOT use SSL, there may be a delay of up to a minute for the initial
+install script - while we check the SSL port to see if anything responds there.
+When communicating with new sites, Red Matrix always attempts connection on the
+SSL port first, before falling back to a less secure connection.
1. Requirements
- Apache with mod-rewrite enabled and "AllowOverride All" so you can use a
diff --git a/version.inc b/version.inc
index c5e597a63..c1e23ebdc 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-05-31.692
+2014-06-01.693