Merge branch 'master' into hookhead

Conflicts:
	include/functions.php

changes for conflicts with master

diff --cc classes/api.php
Simple merge

diff --cc classes/feeds.php
Simple merge

diff --cc classes/handler/public.php
index 810f4c034518de758cb4e99a127c1dac25232781,b154635647db4f2722d0f86999139f9b368d928e..60a961bfa273977c001874ab419139340b8fb39b
--- 1/classes/handler/public.php
--- 2/classes/handler/public.php
+++ b/classes/handler/public.php
@@@ -85,18 -85,19 +85,21 @@@ class Handler_Public extends Handler 
                        }
  
                        $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
 -
 +                      $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
                        while ($line = $this->dbh->fetch_assoc($result)) {
 +                              foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 +                                      $line = $p->hook_query_headlines($line);
 +                              }
  
-                               $tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
+                               $tpl->setVariable('ARTICLE_ID',
+                                       htmlspecialchars($orig_guid ? $line['link'] :
+                                               get_self_url_prefix() .
+                                                       "/public.php?url=" . urlencode($line['link'])), true);
                                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
                                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
 -                              $tpl->setVariable('ARTICLE_EXCERPT',
 -                                      truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
 +                              $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
  
 -                              $content = sanitize($line["content_preview"], false, $owner_uid);
 +                              $content = sanitize($line["content"], false, $owner_uid);
  
                                if ($line['note']) {
                                        $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .

diff --cc include/functions.php
index eb011b6db3c3d0b05a2ac3ecf360767fdd59abbe,cf35d6fa2dee9b4cdb02893fb528d96c2d904019..556b8a8cdf0c3c99de569c744dca99fd6e8fa62d
--- 1/include/functions.php
--- 2/include/functions.php
+++ b/include/functions.php
@@@ -2578,8 -2579,8 +2578,10 @@@
                                }
                        }
  
 -                      $content_query_part = "content, content as content_preview, cached_content, ";
++
 +                      $content_query_part = "content, content AS content_preview, cached_content, ";
 +
+ 
                        if (is_numeric($feed)) {
  
                                if ($feed >= 0) {