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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	mod/connedit.php
This commit is contained in:
redmatrix
2015-07-14 17:10:13 -07:00
parent da5cec24e0 3687fef53c
commit e8f19c1e15
13 changed files with 318 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/contact_selectors.php
View File

@@ -5,7 +5,7 @@ function contact_profile_assign($current) {
$o = '';
$o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" />\r\n";
$o .= "<select id=\"contact-profile-selector\" name=\"profile_assign\" class=\"form-control\"/>\r\n";
$r = q("SELECT profile_guid, profile_name FROM `profile` WHERE `uid` = %d",
intval($_SESSION['uid']));

4
include/zot.php
View File

@@ -1088,7 +1088,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);