diff options
author | zottel <github@zottel.net> | 2012-03-31 00:30:34 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-03-31 00:30:34 +0200 |
commit | f39e8126773e2a030cf84c8b9d428cc78546c1b9 (patch) | |
tree | ec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /include/conversation.php | |
parent | 2212e6931096d188be2dea27bcb4877f16c5c2f8 (diff) | |
parent | aace55df0ad279d74c5e612078c3f29d114389dc (diff) | |
download | volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.gz volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.tar.bz2 volse-hubzilla-f39e8126773e2a030cf84c8b9d428cc78546c1b9.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
-rwxr-xr-x | include/conversation.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1c3ee43b0..a9fb807ad 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( @@ -592,7 +595,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'classtagger' => "", ); } - $filer = t("file as"); + $filer = t("save to folder"); } @@ -912,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?') )); |