aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-03-13 14:41:46 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-03-13 14:41:46 -0400
commit1763a6c9c2a80642291e13f80be8a092465924ae (patch)
treeed6ecc655add4d0fa2bd2bf233fa648d4d875090 /include
parent203fa94e1794d076894f8985bd60622784aa9156 (diff)
parent5a4167646553e589cf9647c0e0d0446e3f5fd672 (diff)
downloadvolse-hubzilla-1763a6c9c2a80642291e13f80be8a092465924ae.tar.gz
volse-hubzilla-1763a6c9c2a80642291e13f80be8a092465924ae.tar.bz2
volse-hubzilla-1763a6c9c2a80642291e13f80be8a092465924ae.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. * master:
Diffstat (limited to 'include')
-rw-r--r--include/text.php27
1 files changed, 27 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index 011006b76..2663bdeba 100644
--- a/include/text.php
+++ b/include/text.php
@@ -913,6 +913,33 @@ function prepare_body($item,$attach = false) {
}
$s .= '<div class="clear"></div></div>';
}
+ $matches = false;
+ $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
+ foreach($matches as $mtch) {
+ if(strlen($x))
+ $x .= ',';
+ $x .= file_tag_decode($mtch[1]);
+ }
+ if(strlen($x))
+ $s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>';
+
+
+ }
+ $matches = false;
+ $x = '';
+ $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
+ foreach($matches as $mtch) {
+ if(strlen($x))
+ $x .= ',';
+ $x .= file_tag_decode($mtch[1]);
+ }
+ if(strlen($x) && (local_user() == $item['uid']))
+ $s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>';
+ }
$prep_arr = array('item' => $item, 'html' => $s);