Merge remote-tracking branch 'upstream/dev' into doco

3 files changed, 20 insertions, 5 deletions

diff --git a/Zotlabs/Module/Card_edit.php b/Zotlabs/Module/Card_edit.php
index b5b44c567..6927c0b6f 100644
--- a/Zotlabs/Module/Card_edit.php
+++ b/Zotlabs/Module/Card_edit.php
@@ -123,7 +123,7 @@ class Card_edit extends \Zotlabs\Web\Controller {
 		$editor = status_editor($a, $x);
 
 		$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-			'$title' => t('Edit Block'),
+			'$title' => t('Edit Card'),
 			'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
 			'$id' => $itm[0]['id'],
 			'$editor' => $editor
diff --git a/Zotlabs/Module/Cards.php b/Zotlabs/Module/Cards.php
index 9114e3b89..22c5d673c 100644
--- a/Zotlabs/Module/Cards.php
+++ b/Zotlabs/Module/Cards.php
@@ -92,6 +92,8 @@ class Cards extends \Zotlabs\Web\Controller {
 			$x = [
 				'webpage'           => ITEM_TYPE_CARD,
 				'is_owner'          => true,
+				'content_label'     => t('Add Card'),
+				'button'            => t('Create'),
 				'nickname'          => $channel['channel_address'],
 				'lockstate'         => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] 
 					|| $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 797b46f93..a86106b6a 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -734,10 +734,8 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		if($parent_item)
 			$parent_mid = $parent_item['mid'];
-	
-		if($webpage == ITEM_TYPE_CARD && $pagetitle) {
-			$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $pagetitle;
-		}
+
+
 
 		// Fallback so that we alway have a thr_parent
 	
@@ -748,6 +746,21 @@ class Item extends \Zotlabs\Web\Controller {
 
 		$item_thread_top = ((! $parent) ? 1 : 0);
 	
+
+		// fix permalinks for cards
+	
+		if($webpage == ITEM_TYPE_CARD) {
+			$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . (($pagetitle) ? $pagetitle : substr($mid,0,16));
+		}
+		if(($parent_item) && ($parent_item['item_type'] == ITEM_TYPE_CARD)) {
+			$r = q("select v from iconfig where iconfig.cat = 'system' and iconfig.k = 'CARD' and iconfig.iid = %d limit 1",
+				intval($parent_item['id'])
+			);
+			if($r) {
+				$plink = z_root() . '/cards/' . $channel['channel_address'] . '/' . $r[0]['v'];
+			}
+		}
+
 		if ((! $plink) && ($item_thread_top)) {
 			$plink = z_root() . '/channel/' . $channel['channel_address'] . '/?f=&mid=' . $mid;
 		}