Compare commits

...

11 Commits
7.6 ... 7.6.1

Author SHA1 Message Date
Mario Vavti
2734335869 version 2022-08-07 14:16:56 +02:00
Mario Vavti
0132c4e36e Merge branch 'dev' 2022-08-07 14:16:31 +02:00
Mario Vavti
7dee47183d changelog 2022-08-07 14:16:00 +02:00
Mario Vavti
9c4988c297 Merge branch 'dev' 2022-08-07 14:07:10 +02:00
Mario Vavti
3bfbc70587 check against null 2022-08-07 14:06:08 +02:00
Mario Vavti
34858fce1c Merge branch 'dev' 2022-08-07 12:17:56 +02:00
Mario Vavti
b47dab0ee9 update widget description 2022-08-05 12:45:43 +02:00
Mario Vavti
6eeb033b96 only decode attachment and iconfig for nonresponse activities 2022-08-04 12:42:35 +02:00
Mario Vavti
0679cb8e00 fix wrong attribution in unseen like notifications 2022-08-04 12:13:00 +02:00
Mario
3abc9ee387 fix regression in dark schema
(cherry picked from commit 2e9211cf41)
2022-07-27 09:29:22 +02:00
Mario
2e9211cf41 fix regression in dark schema 2022-07-27 07:27:51 +00:00
7 changed files with 36 additions and 15 deletions

View File

@@ -1,5 +1,16 @@
Hubzilla 7.6.1 (2022-08-07)
Bugfixes
- Fix attachments displayed in visible response activities
- Fix wrong attribution in unseen like notifications
Addons
- Cards: fix widget not implemented via pdl file (requires re-install)
- Articles: fix widget not implemented via pdl file (requires re-install)
- Wiki: fix widget not implemented via pdl file (requires re-install)
Hubzilla 7.6 (2022-07-26)
- Add filter rule to check for false conition
- Add filter rule to check for false condition
- Implement HQ dashboard to display recently created content for various modules
- Updated spanish translations
- Implement a max oembed size which defaults to 1MB

View File

@@ -2417,7 +2417,7 @@ class Activity {
$s['app'] = escape_tags($generator['name']);
}
if (!$response_activity) {
if (is_array($act->obj) && !$response_activity) {
$a = self::decode_taxonomy($act->obj);
if ($a) {
$s['term'] = $a;
@@ -2429,16 +2429,16 @@ class Activity {
}
}
}
}
$a = self::decode_attachment($act->obj);
if ($a) {
$s['attach'] = $a;
}
$a = self::decode_attachment($act->obj);
if ($a) {
$s['attach'] = $a;
}
$a = self::decode_iconfig($act->obj);
if ($a) {
$s['iconfig'] = $a;
$a = self::decode_iconfig($act->obj);
if ($a) {
$s['iconfig'] = $a;
}
}
if (array_key_exists('type', $act->obj)) {

View File

@@ -226,7 +226,7 @@ class Display extends \Zotlabs\Web\Controller {
);
}
if(!$r) {
if($r === null) {
$r = q("SELECT item.id AS item_id FROM item
WHERE ((mid = '%s'
AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = ''
@@ -263,7 +263,7 @@ class Display extends \Zotlabs\Web\Controller {
);
}
if(! $r) {
if($r === null) {
$r = q("SELECT item.id as item_id from item
WHERE ((parent_mid = '%s'
AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = ''

View File

@@ -2,7 +2,7 @@
/**
* * Name: Channel Activity
* * Description: A widget that shows you a greeting and info about your last login and other channel activities
* * Description: A widget that provides an overview of channels that require your attention and quick links to content that you have recently created or edited
*/
namespace Zotlabs\Widget;

View File

@@ -60,7 +60,7 @@ require_once('include/bbcode.php');
require_once('include/items.php');
define('PLATFORM_NAME', 'hubzilla');
define('STD_VERSION', '7.6');
define('STD_VERSION', '7.6.1');
define('ZOT_REVISION', '6.0');
define('DB_UPDATE_VERSION', 1253);

View File

@@ -1,6 +1,7 @@
<?php /** @file */
use Zotlabs\Lib\Apps;
use Zotlabs\Lib\Activity;
require_once('include/items.php');
@@ -90,7 +91,6 @@ function item_redir_and_replace_images($body, $images, $cid) {
function localize_item(&$item){
if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){
if(! $item['obj'])
return;
@@ -106,6 +106,8 @@ function localize_item(&$item){
$author_link = get_rel_link($obj['author']['link'],'alternate');
elseif(is_array($obj['actor']) && $obj['actor']['url'])
$author_link = ((is_array($obj['actor']['url'])) ? $obj['actor']['url'][0]['href'] : $obj['actor']['url']);
elseif (is_string($obj['actor']))
$author_link = $obj['actor'];
else
$author_link = '';
@@ -114,6 +116,13 @@ function localize_item(&$item){
if(!$author_name)
$author_name = ((is_array($obj['actor']) && $obj['actor']['name']) ? $obj['actor']['name'] : '');
if(!$author_name && is_string($obj['actor'])) {
$cached_actor = Activity::get_cached_actor($obj['actor']);
if (is_array($cached_actor)) {
$author_name = (($cached_actor['name']) ? $cached_actor['name'] : $cached_actor['preferredUsername']);
}
}
if(is_array($obj['link']))
$item_url = get_rel_link($obj['link'],'alternate');

View File

@@ -1,5 +1,6 @@
.generic-content-wrapper {
background-color: transparent;
border: 1px solid #333;
}
textarea, input, select