Merge branch 'master' into tres

5 files changed, 37 insertions, 3 deletions

diff --git a/doc/Comanche.md b/doc/Comanche.md
index 56bf68457..147988938 100644
--- a/doc/Comanche.md
+++ b/doc/Comanche.md
@@ -88,6 +88,10 @@ This places the menu called "mymenu" at this location on the page, which must be
 
 This places a block named "contributors" in this region.
 
+	[block][var=wrap]none[/var]contributors[/block]
+
+The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.
+
 
 **Widgets**
 
diff --git a/doc/comanche.bb b/doc/comanche.bb
index 19a74833e..3afe14489 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -108,6 +108,10 @@ This places the menu called "mymenu" at this location on the page, whi
 [/code]

 This places a block named "contributors" in this region.

 

+[code]

+	[block][var=wrap]none[/var]contributors[/block]

+[/code]

+The variable [var=wrap]none[/var] in a block removes the wrapping div element from the block.

 

 [b]Widgets[/b]

 

diff --git a/include/bbcode.php b/include/bbcode.php
index 47a1fd223..fe5f37260 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -420,7 +420,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
 	// process [observer] tags before we do anything else because we might
 	// be stripping away stuff that then doesn't need to be worked on anymore
 
-	$observer = $a->get_observer();
+	if(get_config('system','item_cache'))
+		$observer = false;
+	else
+		$observer = $a->get_observer();
+
 	if ((strpos($Text,'[/observer]') !== false) || (strpos($Text,'[/rpost]') !== false)) {
 		if ($observer) {
 			$Text = preg_replace("/\[observer\=1\](.*?)\[\/observer\]/ism", '$1', $Text);
@@ -433,7 +437,11 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
 		}
 	}
 
-	$channel = $a->get_channel();
+	if(get_config('system','item_cache'))
+		$channel = false;
+	else
+		$channel = $a->get_channel();
+
 	if (strpos($Text,'[/channel]') !== false) {
 		if ($channel) {
 			$Text = preg_replace("/\[channel\=1\](.*?)\[\/channel\]/ism", '$1', $Text);
diff --git a/include/text.php b/include/text.php
index 1292d49d3..72000b546 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1185,6 +1185,14 @@ function unobscure(&$item) {
 			$item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key);
 		if($item['body'])
 			$item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key);
+		if(get_config('system','item_cache')) {
+			q("update item set title = '%s', body = '%s', item_flags = %d where id = %d",
+				dbesc($item['title']),
+				dbesc($item['body']),
+				intval($item['item_flags'] - ITEM_OBSCURED),
+				intval($item['id'])
+			);
+		}
 	}
 }
 
@@ -1371,8 +1379,12 @@ function generate_named_map($location) {
 
 function prepare_body(&$item,$attach = false) {
 
+	if(get_config('system','item_cache') && $item['html'])
+		return $item['html'];
+
 	call_hooks('prepare_body_init', $item); 
 
+
 	unobscure($item);
 
 	$s = prepare_text($item['body'],$item['mimetype']);
@@ -1440,6 +1452,12 @@ function prepare_body(&$item,$attach = false) {
 	$prep_arr = array('item' => $item, 'html' => $s);
 	call_hooks('prepare_body_final', $prep_arr);
 
+	if(get_config('system','item_cache'))
+		q("update item set html = '%s' where id = %d",
+			dbesc($prep_arr['html']),
+			intval($item['id'])
+		);
+
 	return $prep_arr['html'];
 }
 
diff --git a/version.inc b/version.inc
index 787afe073..06ead016f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-28.1016
+2015-04-30.1018