diff options
| author | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-03-14 08:02:04 -0700 |
| commit | c95deb48398a23de68a3d438b5fffeaea3f3fa01 (patch) | |
| tree | f9e7d080dd0e32d876cb07409b4f8dc1b550b10b /include/conversation.php | |
| parent | f03c57007a2a9ec73902acfb2d951528e68e3117 (diff) | |
| parent | 0bf9595ab19f3af772d20a88eac86dc8cf962c3e (diff) | |
| download | volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.gz volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.tar.bz2 volse-hubzilla-c95deb48398a23de68a3d438b5fffeaea3f3fa01.zip | |
Merge pull request #134 from simonlnu/master
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
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 526c6ea00..a420e9923 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -375,7 +375,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $comments[$item['parent']] = 1; else $comments[$item['parent']] += 1; - } + } elseif(! x($comments,$item['parent'])) + $comments[$item['parent']] = 0; // avoid notices later on } // map all the like/dislike activities for each parent item @@ -571,6 +572,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'classundo' => (($item['starred']) ? "" : "hidden"), 'starred' => t('starred'), 'tagger' => t("add tag"), + 'filer' => t("file as"), 'classtagger' => "", ); } @@ -873,6 +875,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:'), '$whereareu' => t('Where are you right now?'), '$title' => t('Enter a title for this item') )); @@ -915,7 +918,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $o .= replace_macros($tpl,array( '$return_path' => $a->cmd, '$action' => $a->get_baseurl().'/item', - '$share' => (($x['button']) ? $x['button'] : t('Share')), + '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), '$shortupload' => t('upload photo'), '$attach' => t('Attach file'), @@ -980,8 +983,8 @@ function conv_sort($arr,$order) { usort($parents,'sort_thr_commented'); if(count($parents)) - foreach($parents as $x) - $x['children'] = array(); + foreach($parents as $i=>$_x) + $parents[$i]['children'] = array(); foreach($arr as $x) { if($x['id'] != $x['parent']) { |