harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure diaspora_signature is converted to json before we store it.

Browse Source
This commit is contained in:
redmatrix 2015-08-08 15:18:34 -07:00
parent ec5d91d8cf
commit 2656aeaf9c
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/items.php
View File

@ -866,6 +866,9 @@ function get_item_elements($x) {
$arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : '');
if(array_key_exists('diaspora_signature',$x) && is_array($x['diaspora_signature']))
$x['diaspora_signature'] = json_encode($x['diaspora_signature']);
$arr['diaspora_meta'] = (($x['diaspora_signature']) ? json_encode(crypto_encapsulate($x['diaspora_signature'],$key)) : '');
$arr['object'] = activity_sanitise($x['object']);
$arr['target'] = activity_sanitise($x['target']);

24
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2015-07-31.1110\n"
"Project-Id-Version: 2015-08-07.1117\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-07-31 00:03-0700\n"
"POT-Creation-Date: 2015-08-07 00:03-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1019,7 +1019,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:257
#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362
#: ../../mod/events.php:493 ../../mod/photos.php:718 ../../mod/photos.php:1248
#: ../../mod/photos.php:718 ../../mod/photos.php:1248
msgid "Upload"
msgstr ""
@ -3037,14 +3037,14 @@ msgstr ""
msgid "Visible to specific connections."
msgstr ""
#: ../../include/items.php:4209 ../../mod/thing.php:74
#: ../../include/items.php:4215 ../../mod/thing.php:74
#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
#: ../../mod/display.php:36
msgid "Item not found."
msgstr ""
#: ../../include/items.php:4282 ../../include/attach.php:137
#: ../../include/items.php:4288 ../../include/attach.php:137
#: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:319 ../../include/attach.php:350
@ -3087,26 +3087,26 @@ msgstr ""
msgid "Permission denied."
msgstr ""
#: ../../include/items.php:4684 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../include/items.php:4690 ../../mod/group.php:38 ../../mod/group.php:140
#: ../../mod/bulksetclose.php:51
msgid "Collection not found."
msgstr ""
#: ../../include/items.php:4700
#: ../../include/items.php:4706
msgid "Collection is empty."
msgstr ""
#: ../../include/items.php:4707
#: ../../include/items.php:4713
#, php-format
msgid "Collection: %s"
msgstr ""
#: ../../include/items.php:4717 ../../mod/connedit.php:662
#: ../../include/items.php:4723 ../../mod/connedit.php:662
#, php-format
msgid "Connection: %s"
msgstr ""
#: ../../include/items.php:4719
#: ../../include/items.php:4725
msgid "Connection not found."
msgstr ""
@ -4429,6 +4429,10 @@ msgstr ""
msgid "Export"
msgstr ""
#: ../../mod/events.php:493
msgid "Import"
msgstr ""
#: ../../mod/events.php:518
msgid "Event removed"
msgstr ""

2
version.inc
View File

@ -1 +1 @@
2015-08-06.1116
2015-08-08.1118