diff options
| author | root <root@diekershoff.homeunix.net> | 2010-12-08 06:54:13 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2010-12-08 06:54:13 +0100 |
| commit | a96da925712184eec97f6ca01072b7c2bee92a7e (patch) | |
| tree | c0a99dd7bbc6b479b040a8ef08cabee5f0f56e38 /mod/display.php | |
| parent | af48dbec7f87a75a66f79887b6d2419b661e263d (diff) | |
| parent | a42b9ea3dea5e1490dd4aa4852760354d569ea51 (diff) | |
| download | volse-hubzilla-a96da925712184eec97f6ca01072b7c2bee92a7e.tar.gz volse-hubzilla-a96da925712184eec97f6ca01072b7c2bee92a7e.tar.bz2 volse-hubzilla-a96da925712184eec97f6ca01072b7c2bee92a7e.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/display.php b/mod/display.php index aa9455361..ec036de62 100644 --- a/mod/display.php +++ b/mod/display.php @@ -142,8 +142,8 @@ function display_content(&$a) { && ($item['id'] != $item['parent'])) continue; - $lock = (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) - || strlen($item['deny_cid']) || strlen($item['deny_gid'])) + $lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) + || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>' : '<div class="wall-item-lock"></div>'); @@ -235,6 +235,12 @@ function display_content(&$a) { $location = '<span class="smalltext">' . $coord . '</span>'; } + $indent = (($item['parent'] != $item['item_id']) ? ' comment' : ''); + + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) + $indent .= ' shiny'; + + $o .= replace_macros($template,array( '$id' => $item['item_id'], '$profile_url' => $profile_link, @@ -247,7 +253,7 @@ function display_content(&$a) { '$ago' => relative_date($item['created']), '$lock' => $lock, '$location' => $location, - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => $indent, '$owner_url' => $owner_url, '$owner_photo' => $owner_photo, '$owner_name' => $owner_name, |