diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-09-22 16:26:28 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-22 16:26:28 -0700 |
commit | 1d7d9818fabcdf2bd34e9e9355c97045dd4ef359 (patch) | |
tree | 4952f393a8a4608e9a80c327862e058aae9e2df9 /include/items.php | |
parent | 7dd61c05dcf169807aed91d305ea235bcaa9035e (diff) | |
parent | c2dcc6880302406de6e1abf90c985975e8a4f13a (diff) | |
download | volse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.tar.gz volse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.tar.bz2 volse-hubzilla-1d7d9818fabcdf2bd34e9e9355c97045dd4ef359.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/items.php
include/zot.php
Diffstat (limited to 'include/items.php')
-rwxr-xr-x | include/items.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index b209e55c5..7793d1fb2 100755 --- 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 |