diff options
| author | friendica <info@friendica.com> | 2015-03-29 16:05:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-29 16:05:24 -0700 |
| commit | b546f8d702157410a834000cc7a6aa621e78f427 (patch) | |
| tree | 71dbbe2471783524af84f5fb21f4fa575e315247 /include/conversation.php | |
| parent | 505e5e90b26fa398e08b6fcad266b7f0ac759bd2 (diff) | |
| parent | 9ae9aedb15dfcb66f5bd9d866bdfb76309c81788 (diff) | |
| download | volse-hubzilla-b546f8d702157410a834000cc7a6aa621e78f427.tar.gz volse-hubzilla-b546f8d702157410a834000cc7a6aa621e78f427.tar.bz2 volse-hubzilla-b546f8d702157410a834000cc7a6aa621e78f427.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 4018ced28..042d01b3e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1044,7 +1044,6 @@ function builtin_activity_puller($item, &$conv_responses) { return; } } - } @@ -1053,7 +1052,7 @@ function builtin_activity_puller($item, &$conv_responses) { * * @param int $cnt number of people who like/dislike the item * @param array $arr array of pre-linked names of likers/dislikers - * @param string $typ eone of 'like, 'dislike' + * @param string $type one of 'like, 'dislike' * @param int $id item id * @return string formatted text */ @@ -1146,7 +1145,6 @@ function status_editor($a, $x, $popup = false) { '$expireswhen' => t('Expires YYYY-MM-DD HH:MM') )); - $tpl = get_markup_template('jot.tpl'); $jotplugins = ''; @@ -1461,8 +1459,8 @@ function network_tabs() { if ($no_active=='active' && x($_GET,'order')) { switch($_GET['order']){ - case 'post': $postord_active = 'active'; $no_active=''; break; - case 'comment' : $all_active = 'active'; $no_active=''; break; + case 'post': $postord_active = 'active'; $no_active=''; break; + case 'comment' : $all_active = 'active'; $no_active=''; break; } } |