From b2feb264928908677e4c2b8de4722a2dc93d5ffa Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 23 Jun 2014 17:05:03 -0700
Subject: clean up the awful descriptive text on thing input

---
 include/taxonomy.php | 2 +-
 mod/thing.php        | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/taxonomy.php b/include/taxonomy.php
index 803e1ae0a..92003328f 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -266,7 +266,7 @@ function obj_verb_selector($current = '') {
 	$o .= '<select class="obj-verb-selector" name="verb" >';
 	foreach($verbs as $k => $v) {
 		$selected = (($k == $current) ? ' selected="selected" ' : '');
-		$o .= '<option value="' . urlencode($k) . '"' . $selected . '>' . $v[0] . '</option>';
+		$o .= '<option value="' . urlencode($k) . '"' . $selected . '>' . $v[1] . '</option>';
 	}
 	$o .= '</select>';
 	return $o;
diff --git a/mod/thing.php b/mod/thing.php
index cbf83fdf8..b6d59a3ee 100644
--- a/mod/thing.php
+++ b/mod/thing.php
@@ -243,12 +243,15 @@ function thing_content(&$a) {
 		}
 	}
 
-	if(! local_user()) {
+	$channel = $a->get_channel();
+
+	if(! (local_user() && $channel)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
 	$thing_hash = '';
+	
 
 	if(argc() == 3 && argv(1) === 'edit') {
 		$thing_hash = argv(2);
@@ -270,7 +273,7 @@ function thing_content(&$a) {
 			'$multiprof' => feature_enabled(local_user(),'multi_profiles'),
 			'$profile_lbl' => t('Select a profile'),
 			'$profile_select' => contact_profile_assign($r[0]['obj_page']),
-			'$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
+			'$verb_lbl' => $channel['channel_name'],
 			'$verb_select' => obj_verb_selector($r[0]['obj_verb']),
 			'$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')),
 			'$thing_hash' => $thing_hash,
@@ -317,7 +320,7 @@ function thing_content(&$a) {
 		'$multiprof' => feature_enabled(local_user(),'multi_profiles'),
 		'$profile_lbl' => t('Select a profile'),
 		'$profile_select' => contact_profile_assign(''),
-		'$verb_lbl' => t('Select a category of stuff. e.g. I ______ something'),
+		'$verb_lbl' => $channel['channel_name'],
 		'$activity' => array('activity',t('Post an activity'),true,t('Only sends to viewers of the applicable profile')),
 		'$verb_select' => obj_verb_selector(),
 		'$thing_lbl' => t('Name of thing e.g. something'),
-- 
cgit v1.2.3