aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-02 01:18:18 -0700
committerredmatrix <git@macgirvin.com>2016-05-02 01:18:18 -0700
commit559ed3f0a8cbe90b6c20cc4ada649bc063f41c25 (patch)
treee8d217bd0ee275187a179f40ffedcb051dccc4cd
parenta10fe5f13e67faa33a72caa33c49c36113213ffe (diff)
downloadvolse-hubzilla-559ed3f0a8cbe90b6c20cc4ada649bc063f41c25.tar.gz
volse-hubzilla-559ed3f0a8cbe90b6c20cc4ada649bc063f41c25.tar.bz2
volse-hubzilla-559ed3f0a8cbe90b6c20cc4ada649bc063f41c25.zip
sort out the rest of the source categories
-rw-r--r--Zotlabs/Module/Sources.php4
-rwxr-xr-xinclude/items.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php
index ef32991ee..a180d9b6e 100644
--- a/Zotlabs/Module/Sources.php
+++ b/Zotlabs/Module/Sources.php
@@ -109,7 +109,7 @@ class Sources extends \Zotlabs\Web\Controller {
'$desc' => t('Import all or selected content from the following channel into this channel and distribute it according to your channel settings.'),
'$words' => array( 'words', t('Only import content with these words (one per line)'),'',t('Leave blank to import all public content')),
'$name' => array( 'name', t('Channel Name'), '', ''),
- '$tags' => array('tags', t('Add the following tags to posts imported from this source (comma separated)','','')),
+ '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),'',t('Optional')),
'$submit' => t('Submit')
));
@@ -144,7 +144,7 @@ class Sources extends \Zotlabs\Web\Controller {
'$words' => array( 'words', t('Only import content with these words (one per line)'),$r[0]['src_patt'],t('Leave blank to import all public content')),
'$xchan' => $r[0]['src_xchan'],
'$abook' => $x[0]['abook_id'],
- '$tags' => array('tags', t('Add the following tags to posts imported from this source (comma separated)'),$r[0]['src_tag'],''),
+ '$tags' => array('tags', t('Add the following categories to posts imported from this source (comma separated)'),$r[0]['src_tag'],t('Optional')),
'$name' => array( 'name', t('Channel Name'), $r[0]['xchan_name'], ''),
'$submit' => t('Submit')
));
diff --git a/include/items.php b/include/items.php
index 3649ef8c9..b3c9403e0 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3420,9 +3420,9 @@ function start_delivery_chain($channel, $item, $item_id, $parent) {
intval($channel['channel_id']),
intval($item_id),
intval(TERM_OBJ_POST),
- intval(TERM_UNKNOWN),
+ intval(TERM_CATEGORY),
dbesc($tt),
- dbesc(z_root() . '/search?f=&tag=' . urlencode($tt))
+ dbesc(z_root() . '/channel/' . $channel['channel_address'] . '?f=&cat=' . urlencode($tt))
);
}
}