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

Merge branch 'origin' into 'master'

Browse Source 
marge from origin 3.8.9

See merge request harukin/core!38
This commit is contained in:
harukin 2019-02-11 17:51:43 +09:00
commit 5f012c5dc9
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/New_channel.php
View File

@ -134,7 +134,7 @@ class New_channel extends \Zotlabs\Web\Controller {
$default_role = ''; $default_role = '';
$aid = get_account_id(); $aid = get_account_id();
if($aid) { if($aid) {
$r = q("select count(channel_id) as total from channel where channel_account_id = %d", $r = q("select count(channel_id) as total from channel where channel_account_id = %d and channel_removed = 0",
intval($aid) intval($aid)
); );
if($r && (! intval($r[0]['total']))) { if($r && (! intval($r[0]['total']))) {

11
Zotlabs/Module/Oep.php
View File

@ -181,7 +181,7 @@ class Oep extends \Zotlabs\Web\Controller {
dbesc($res) dbesc($res)
); );
if($r) { if($r) {
$sql_extra = "and item.id = " . intval($r[0]['iid']) . " "; $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
} }
else { else {
return $ret; return $ret;
@ -194,6 +194,9 @@ class Oep extends \Zotlabs\Web\Controller {
intval(ITEM_TYPE_CARD) intval(ITEM_TYPE_CARD)
); );
if(! $r)
return;
$item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0 $item_normal = " and item.item_hidden = 0 and item.item_type in (0,6) and item.item_deleted = 0
and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
and item.item_blocked = 0 "; and item.item_blocked = 0 ";
@ -255,7 +258,6 @@ class Oep extends \Zotlabs\Web\Controller {
if(! $channel) if(! $channel)
return $ret; return $ret;
if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages')) if(! perm_is_allowed($channel['channel_id'],get_observer_hash(),'view_pages'))
return $ret; return $ret;
@ -265,7 +267,7 @@ class Oep extends \Zotlabs\Web\Controller {
dbesc($res) dbesc($res)
); );
if($r) { if($r) {
$sql_extra = "and item.id = " . intval($r[0]['iid']) . " "; $sql_extra .= " and item.id = " . intval($r[0]['iid']) . " ";
} }
else { else {
return $ret; return $ret;
@ -278,6 +280,9 @@ class Oep extends \Zotlabs\Web\Controller {
intval(ITEM_TYPE_ARTICLE) intval(ITEM_TYPE_ARTICLE)
); );
if(! $r)
return;
$item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0 $item_normal = " and item.item_hidden = 0 and item.item_type in (0,7) and item.item_deleted = 0
and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0 and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
and item.item_blocked = 0 "; and item.item_blocked = 0 ";

2
boot.php
View File

@ -50,7 +50,7 @@ require_once('include/attach.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '3.8.8' ); define ( 'STD_VERSION', '3.8.9' );
define ( 'ZOT_REVISION', '6.0a' ); define ( 'ZOT_REVISION', '6.0a' );
define ( 'DB_UPDATE_VERSION', 1225 ); define ( 'DB_UPDATE_VERSION', 1225 );

5
include/import.php
View File

@ -1035,8 +1035,9 @@ function import_mail($channel, $mails, $sync = false) {
if(! $m) if(! $m)
continue; continue;
$m['aid'] = $channel['channel_account_id']; $m['account_id'] = $channel['channel_account_id'];
$m['uid'] = $channel['channel_id']; $m['channel_id'] = $channel['channel_id'];
$mail_id = mail_store($m); $mail_id = mail_store($m);
if($sync && $mail_id) { if($sync && $mail_id) {
Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id)); Zotlabs\Daemon\Master::Summon(array('Notifier','single_mail',$mail_id));

4
view/js/main.js
View File

@ -832,10 +832,10 @@ function collapseHeight() {
}); });
var collapsedContentHeight = Math.ceil($("#region_2").height()); var collapsedContentHeight = Math.ceil($("#region_2").height());
contentHeightDiff = origContentHeight - collapsedContentHeight; contentHeightDiff = liking ? 0 : origContentHeight - collapsedContentHeight;
console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px'); console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px');
if(i){ if(i && !liking){
var sval = position - cDiff + ($(".divgrow-showmore").outerHeight() * i); var sval = position - cDiff + ($(".divgrow-showmore").outerHeight() * i);
console.log('collapsed above viewport count: ' + i); console.log('collapsed above viewport count: ' + i);
$(window).scrollTop(sval); $(window).scrollTop(sval);