Merge commit 'upstream/master'

diff --cc include/text.php
index 08c5a542464ffa189e66a6391cdd6b0162231970,199460d2cf12104841d27085a3d8db9a14c34559..d34fd7fbeec35bcacfb5a1bd2fa201a3e770d692
--- 1/include/text.php
--- 2/include/text.php
+++ b/include/text.php
@@@ -874,21 -874,10 +874,22 @@@ function link_compare($a,$b) 
  if(! function_exists('prepare_body')) {
  function prepare_body($item,$attach = false) {
  
+       $a = get_app();
        call_hooks('prepare_body_init', $item); 
  
 -      $s = prepare_text($item['body']);
 +      $cache = get_config('system','itemcache');
 +
 +      if (($cache != '')) {
 +              $cachefile = $cache."/".$item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']);
 +
 +              if (file_exists($cachefile))
 +                      $s = file_get_contents($cachefile);
 +              else {
 +                      $s = prepare_text($item['body']);
 +                      file_put_contents($cachefile, $s);
 +              }
 +      } else
 +              $s = prepare_text($item['body']);
  
        $prep_arr = array('item' => $item, 'html' => $s);
        call_hooks('prepare_body', $prep_arr);
@@@ -926,10 -914,37 +927,37 @@@
                }
                $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 .= '&nbsp;&nbsp;&nbsp;';
+                       $x .= file_tag_decode($mtch[1]). ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . file_tag_decode($mtch[1]) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
+               }
+               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);
        call_hooks('prepare_body_final', $prep_arr);
 +
        return $prep_arr['html'];
  }}
  

diff --cc view/theme/diabook/style.css
Simple merge