diff options
| author | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:56:42 +0000 |
|---|---|---|
| committer | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:56:42 +0000 |
| commit | 5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6 (patch) | |
| tree | 6f15b4cff6c76ee7f93b4e50f28142b3eaee5007 /include/conversation.php | |
| parent | 3d249f0eddb058f74b33d8205202b17ab7555aa6 (diff) | |
| download | volse-hubzilla-5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6.tar.gz volse-hubzilla-5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6.tar.bz2 volse-hubzilla-5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6.zip | |
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
Diffstat (limited to 'include/conversation.php')
| -rwxr-xr-x | include/conversation.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 9f564843e..bd9b11bee 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -373,7 +373,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 @@ -921,7 +922,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'), |