aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/ThreadStream.php4
-rw-r--r--Zotlabs/Module/Item.php13
2 files changed, 5 insertions, 12 deletions
diff --git a/Zotlabs/Lib/ThreadStream.php b/Zotlabs/Lib/ThreadStream.php
index 7fe8fcc2e..2ad24a690 100644
--- a/Zotlabs/Lib/ThreadStream.php
+++ b/Zotlabs/Lib/ThreadStream.php
@@ -69,12 +69,12 @@ class ThreadStream {
case 'cards':
$this->profile_owner = \App::$profile['profile_uid'];
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- $this->reload = $_SESSION['return_url'];
+ //$this->reload = $_SESSION['return_url'];
break;
case 'articles':
$this->profile_owner = \App::$profile['profile_uid'];
$this->writable = perm_is_allowed($this->profile_owner,$ob_hash,'post_comments');
- $this->reload = $_SESSION['return_url'];
+ //$this->reload = $_SESSION['return_url'];
break;
case 'display':
// in this mode we set profile_owner after initialisation (from conversation()) and then
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 7bf8b21d5..e1ba2b2f0 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -743,6 +743,8 @@ class Item extends Controller {
$webpage = $parent_item['item_type'];
}
+
+
if ((!$allow_empty) && (!strlen($body))) {
if ($preview)
killme();
@@ -807,7 +809,6 @@ class Item extends Controller {
$post_tags = [];
-
if ($mimetype === 'text/bbcode') {
require_once('include/text.php');
@@ -919,15 +920,7 @@ class Item extends Controller {
$cats = explode(',', $categories);
foreach ($cats as $cat) {
- if ($webpage == ITEM_TYPE_CARD) {
- $catlink = z_root() . '/cards/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
- }
- elseif ($webpage == ITEM_TYPE_ARTICLE) {
- $catlink = z_root() . '/articles/' . $channel['channel_address'] . '?f=&cat=' . urlencode(trim($cat));
- }
- else {
- $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
- }
+ $catlink = $owner_xchan['xchan_url'] . '?f=&cat=' . urlencode(trim($cat));
$post_tags[] = [
'uid' => $profile_uid,