diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-07-14 17:10:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-14 17:10:13 -0700 |
| commit | e8f19c1e15f9ba728ca19222a62da602b862c77c (patch) | |
| tree | b1434ba4eea81d9ad0e951a9acd9e5f83ebafd20 /include | |
| parent | da5cec24e018cded947f931e2398ea43e052caed (diff) | |
| parent | 3687fef53c5eeef7153306f45c5f187d5bfca68c (diff) | |
| download | volse-hubzilla-e8f19c1e15f9ba728ca19222a62da602b862c77c.tar.gz volse-hubzilla-e8f19c1e15f9ba728ca19222a62da602b862c77c.tar.bz2 volse-hubzilla-e8f19c1e15f9ba728ca19222a62da602b862c77c.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/connedit.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/contact_selectors.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 726efce9d..8671f1bd1 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -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'])); diff --git a/include/zot.php b/include/zot.php index 4ac346002..a43c6bc1b 100644 --- a/include/zot.php +++ b/include/zot.php @@ -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); |