Merge remote-tracking branch 'upstream/master'

diff --cc include/api.php
Simple merge

diff --cc include/poller.php
Simple merge

diff --cc object/Item.php
index 5cea341f029f562d647d2a717b172626e392f662,eef8a50581d773b39ea89e6a59fcb25c54997e15..0ea9954b0a5a2489ad4c6f2228326ab7c5bbc734
--- 1/object/Item.php
--- 2/object/Item.php
+++ b/object/Item.php
@@@ -212,18 -212,30 +212,35 @@@ class Item extends BaseObject 
  
                localize_item($item);
  
 +              if ($item["postopts"]) {
 +                      $langdata = explode(";", $item["postopts"]);
 +                      $langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
 +              }
 +
                $body = prepare_body($item,true);
  
 -        list($categories, $folders) = get_cats_and_terms($item);
 +              list($categories, $folders) = get_cats_and_terms($item);
  
+               if($a->theme['template_engine'] === 'internal') {
+                       $body_e = template_escape($body);
+                       $text_e = strip_tags(template_escape($body));
+                       $name_e = template_escape($profile_name);
+                       $title_e = template_escape($item['title']);
+                       $location_e = template_escape($location);
+                       $owner_name_e = template_escape($this->get_owner_name());
+               }
+               else {
+                       $body_e = $body;
+                       $text_e = strip_tags($body);
+                       $name_e = $profile_name;
+                       $title_e = $item['title'];
+                       $location_e = $location;
+                       $owner_name_e = $this->get_owner_name();
+               }
+ 
                $tmp_item = array(
                        'template' => $this->get_template(),
 -                      
 +
                        'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
                        'tags' => $tags,
              'hashtags' => $hashtags,