diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-01 11:49:22 +0100 |
| commit | dd9432903ddb3e12381881da44fb84afff832d52 (patch) | |
| tree | b499e77cd4faf8157c2e048fb8242bc2ca2720cc /include/text.php | |
| parent | e0c659b34b8992111bcc64d3f0eea75dfa193412 (diff) | |
| parent | bd2c8c92f1b30d8f811bd4aab0fe3a2c5496ec61 (diff) | |
| download | volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.gz volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.tar.bz2 volse-hubzilla-dd9432903ddb3e12381881da44fb84afff832d52.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
| -rwxr-xr-x | include/text.php | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index 0f7d2f731..81e22527a 100755 --- a/include/text.php +++ b/include/text.php @@ -996,7 +996,7 @@ function lang_selector() { } $ll = substr($l,5); $ll = substr($ll,0,strrpos($ll,'/')); - $selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : ''); + $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : ''); $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>'; } } @@ -1201,3 +1201,16 @@ function reltoabs($text, $base) return $text; } +function item_post_type($item) { + if(intval($item['event-id'])) + return t('event'); + if(strlen($item['resource-id'])) + return t('photo'); + if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) + return t('activity'); + if($item['id'] != $item['parent']) + return t('comment'); + return t('post'); +} + + |