Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: include/items.php include/zot.php
2015-09-22 16:26:28 -07:00
parent 7dd61c05dc c2dcc68803
commit 1d7d9818fa
2 changed files with 10 additions and 0 deletions
--- a/include/items.php
+++ b/include/items.php
@@ -836,6 +836,7 @@ function title_is_body($title, $body) {
 function get_item_elements($x,$allow_code = false) {

 	$arr = array();
+
 	if($allow_code)
 		$arr['body'] = $x['body'];
 	else