aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-14 16:54:16 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-14 16:54:16 -0700
commita5989b0f310b117238fc4728d359a2151f3de6e7 (patch)
tree436b9d0945eb4e893881d20be3f6a174e609a856
parentb7d3eb16056d4c91f60f3ae1e3b0085fdd6331b6 (diff)
downloadvolse-hubzilla-a5989b0f310b117238fc4728d359a2151f3de6e7.tar.gz
volse-hubzilla-a5989b0f310b117238fc4728d359a2151f3de6e7.tar.bz2
volse-hubzilla-a5989b0f310b117238fc4728d359a2151f3de6e7.zip
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
-rw-r--r--include/zot.php4
-rwxr-xr-xmod/setup.php2
-rw-r--r--version.inc2
3 files changed, 5 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index 34e7f3e42..9a20084c4 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1110,7 +1110,9 @@ function zot_import($arr, $sender_url) {
logger('specific recipients');
$recip_arr = array();
foreach($i['notify']['recipients'] as $recip) {
- $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
+ if(is_array($recip)) {
+ $recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
+ }
}
stringify_array_elms($recip_arr);
$recips = implode(',',$recip_arr);
diff --git a/mod/setup.php b/mod/setup.php
index d88cf73f1..bba29921e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -729,6 +729,6 @@ function what_next() {
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
.t('Please see the file "install/INSTALL.txt".')
."</p><p>"
- .t("Go to your new Red node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
+ .t("Go to your new hub <a href='$baseurl/register'>registration page</a> and register as new member. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
."</p>";
}
diff --git a/version.inc b/version.inc
index d193b7989..11c628215 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-11.1090
+2015-07-14.1093