diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-06-22 18:00:23 +0100 |
| commit | 388872949ed0de4cf036e546fafb3f4b4bd04fee (patch) | |
| tree | 2fcefc5c8f2398166b8e7003033fe160cb3325fc /mod/item.php | |
| parent | b47ff712deafdb8617599b0af4403b9563c9be93 (diff) | |
| parent | 301c7cdb89b13c4fc7c502795f121e13c1f9441d (diff) | |
| download | volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.gz volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.tar.bz2 volse-hubzilla-388872949ed0de4cf036e546fafb3f4b4bd04fee.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php index d4c8a6f4a..5ddafb709 100644 --- a/mod/item.php +++ b/mod/item.php @@ -46,7 +46,7 @@ function item_post(&$a) { call_hooks('post_local_start', $_REQUEST); - logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); +// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); @@ -376,6 +376,7 @@ function item_post(&$a) { } } + $expires = '0000-00-00 00:00:00'; if(feature_enabled($profile_uid,'content_expire')) { @@ -396,6 +397,7 @@ function item_post(&$a) { $body = z_input_filter($profile_uid,$body,$mimetype); } + // Verify ability to use html or php!!! $execflag = false; @@ -417,6 +419,7 @@ function item_post(&$a) { } } + if($mimetype === 'text/bbcode') { // BBCODE alert: the following functions assume bbcode input @@ -465,7 +468,6 @@ function item_post(&$a) { $body = preg_replace_callback('/\[img(.*?)\](.*?)\[\/img\]/ism','red_zrlify_img_callback',$body); - /** * * When a photo was uploaded into the message using the (profile wall) ajax @@ -513,6 +515,7 @@ function item_post(&$a) { $body = scale_external_images($body,false); + /** * Look for any tags and linkify them */ @@ -603,7 +606,6 @@ function item_post(&$a) { // BBCODE end alert - if(strlen($categories)) { $cats = explode(',',$categories); foreach($cats as $cat) { |