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

Merge branch 'core_fixes' into 'dev'

Browse Source 
Core fixes

See merge request hubzilla/core!1569
This commit is contained in:
M. Dent 2019-03-24 03:20:24 +01:00
commit 9ebf6bcc92
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/DReport.php
View File

@ -118,7 +118,7 @@ class DReport {
// So if a remote site says they can't find us, that's no big surprise // So if a remote site says they can't find us, that's no big surprise
// and just creates a lot of extra report noise // and just creates a lot of extra report noise
if(($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient_not_found')) if(($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient not found'))
return false; return false;
// If you have a private post with a recipient list, every single site is going to report // If you have a private post with a recipient list, every single site is going to report

2
Zotlabs/Lib/Libsync.php
View File

@ -336,7 +336,7 @@ class Libsync {
$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text','abook_not_here'); $disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text','abook_not_here');
$fields = db_columns($abook); $fields = db_columns('abook');
foreach($arr['abook'] as $abook) { foreach($arr['abook'] as $abook) {

2
Zotlabs/Lib/Libzotdir.php
View File

@ -307,7 +307,7 @@ class Libzotdir {
if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) { if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
$success = false; $success = false;
$href = \Zotlabs\Lib\Webfinger::zot_url(punify($url)); $href = \Zotlabs\Lib\Webfinger::zot_url(punify($ud['ud_addr']));
if($href) { if($href) {
$zf = \Zotlabs\Lib\Zotfinger::exec($href); $zf = \Zotlabs\Lib\Zotfinger::exec($href);
} }

2
Zotlabs/Lib/ZotURL.php
View File

@ -66,7 +66,7 @@ class ZotURL {
} }
static public function is_zoturl($s) { static public function is_zoturl($url) {
if(strpos($url,'x-zot:') === 0) { if(strpos($url,'x-zot:') === 0) {
return true; return true;

2
Zotlabs/Module/Acl.php
View File

@ -166,7 +166,7 @@ class Acl extends \Zotlabs\Web\Controller {
if($extra_channels) { if($extra_channels) {
foreach($extra_channels as $channel) { foreach($extra_channels as $channel) {
if(perm_is_allowed(intval($channel), get_observer_hash(),'view_contacts')) { if(perm_is_allowed(intval($channel), get_observer_hash(),'view_contacts')) {
if($extra_channel_sql) if($extra_channels_sql)
$extra_channels_sql .= ','; $extra_channels_sql .= ',';
$extra_channels_sql .= intval($channel); $extra_channels_sql .= intval($channel);
} }

4
Zotlabs/Module/Changeaddr.php
View File

@ -31,7 +31,7 @@ class Changeaddr extends \Zotlabs\Web\Controller {
if($account['account_password_changed'] > NULL_DATE) { if($account['account_password_changed'] > NULL_DATE) {
$d1 = datetime_convert('UTC','UTC','now - 48 hours'); $d1 = datetime_convert('UTC','UTC','now - 48 hours');
if($account['account_password_changed'] > d1) { if($account['account_password_changed'] > $d1) {
notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL); notice( t('Channel name changes are not allowed within 48 hours of changing the account password.') . EOL);
return; return;
} }
@ -49,7 +49,7 @@ class Changeaddr extends \Zotlabs\Web\Controller {
if(check_webbie(array($new_address)) !== $new_address) { if(check_webbie(array($new_address)) !== $new_address) {
notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL); notice( t('Nickname has unsupported characters or is already being used on this site.') . EOL);
return $ret; return;
} }
channel_change_address($channel,$new_address); channel_change_address($channel,$new_address);

8
Zotlabs/Module/Dirsearch.php
View File

@ -116,12 +116,12 @@ class Dirsearch extends \Zotlabs\Web\Controller {
$sql_extra .= $this->dir_query_build($joiner,'xchan_name',$name); $sql_extra .= $this->dir_query_build($joiner,'xchan_name',$name);
if($address) if($address)
$sql_extra .= $this->dir_query_build($joiner,'xchan_addr',$address); $sql_extra .= $this->dir_query_build($joiner,'xchan_addr',$address);
if($city) if($locale)
$sql_extra .= $this->dir_query_build($joiner,'xprof_locale',$city); $sql_extra .= $this->dir_query_build($joiner,'xprof_locale',$locale);
if($region) if($region)
$sql_extra .= $this->dir_query_build($joiner,'xprof_region',$region); $sql_extra .= $this->dir_query_build($joiner,'xprof_region',$region);
if($post) if($postcode)
$sql_extra .= $this->dir_query_build($joiner,'xprof_postcode',$post); $sql_extra .= $this->dir_query_build($joiner,'xprof_postcode',$postcode);
if($country) if($country)
$sql_extra .= $this->dir_query_build($joiner,'xprof_country',$country); $sql_extra .= $this->dir_query_build($joiner,'xprof_country',$country);
if($gender) if($gender)

2
Zotlabs/Module/Subthread.php
View File

@ -33,7 +33,7 @@ class Subthread extends \Zotlabs\Web\Controller {
if(! $i) { if(! $i) {
$i = q("select * from item where id = %d and uid = %d", $i = q("select * from item where id = %d and uid = %d",
intval($postid), intval($item_id),
intval($sys['channel_id']) intval($sys['channel_id'])
); );

2
Zotlabs/Module/Tagger.php
View File

@ -69,7 +69,7 @@ class Tagger extends \Zotlabs\Web\Controller {
$post_type = t('photo'); $post_type = t('photo');
break; break;
case 'event': case 'event':
$targgettype = ACTIVITY_OBJ_EVENT; $targettype = ACTIVITY_OBJ_EVENT;
$post_type = t('event'); $post_type = t('event');
break; break;
default: default: