From 87539dbec4b73039f7f5e4fa58c3398d9e496834 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 30 Mar 2012 02:22:57 -0700 Subject: bug #352 - qcomment plugin disabled, qcomments still allowed --- include/conversation.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index 1c3ee43b0..402713b32 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -532,9 +532,12 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share')); } + $qc = $qcomment = null; - $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); - $qcomment = (($qc) ? explode("\n",$qc) : null); + if(in_array('qcomment',$a->plugins)) { + $qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null); + $qcomment = (($qc) ? explode("\n",$qc) : null); + } if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) { $comment = replace_macros($cmnt_tpl,array( -- cgit v1.2.3 From bcc58016089c5e5c0e1e5e247d9253b4ac664c2c Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 30 Mar 2012 02:42:36 -0700 Subject: rename "file as" to "save to folder" --- include/conversation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index 402713b32..a9fb807ad 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -595,7 +595,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'classtagger' => "", ); } - $filer = t("file as"); + $filer = t("save to folder"); } @@ -915,7 +915,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$vidurl' => t("Please enter a video link/URL:"), '$audurl' => t("Please enter an audio link/URL:"), '$term' => t('Tag term:'), - '$fileas' => t('File as:'), + '$fileas' => t('Save to Folder:'), '$whereareu' => t('Where are you right now?') )); -- cgit v1.2.3