From: Michael Vogel <icarus@dabo.de>
Date: Thu, 15 Mar 2012 20:11:58 +0000 (+0100)
Subject: Merge commit 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9243c9fc141237453f05d215058d4b975d010437;p=friendica.git

Merge commit 'upstream/master'
---

9243c9fc141237453f05d215058d4b975d010437
diff --cc include/text.php
index 08c5a54246,199460d2cf..d34fd7fbee
--- a/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'];
  }}