Merge pull request #6516 from Ixiter/develop

BBCode - added preg_replaces for local [url] links without target="_blank"

diff --git a/mod/newmember.php b/mod/newmember.php
index c2ffe6464ed3fd2c96ba0c079c69774953ca3d80..b1eda7a2d11518e9e85ee946da38bacd8dd38000 100644 (file)
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -15,7 +15,7 @@ function newmember_content(App $a)
        $o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
        $o .= '<h4>' . L10n::t('Getting Started') . '</h4>';
        $o .= '<ul>';
-       $o .= '<li> ' . '<a target="newmember" href="help/guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
+       $o .= '<li> ' . '<a target="newmember" href="help/Quick-Start-guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
        $o .= '</ul>';
        $o .= '<h4>' . L10n::t('Settings') . '</h4>';
        $o .= '<ul>';

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d01adc4432a523645c92d82341be2a675..558b274919ce33bad609074dec5aac569ceca9e0 100644 (file)
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,9 +31,14 @@ class Objects extends BaseModule
                /// @todo Add Authentication to enable fetching of non public content
                // $requester = HTTPSignature::getSigner('', $_SERVER);
 
+               // At first we try the original post with that guid
                $item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
                if (!DBA::isResult($item)) {
-                       System::httpExit(404);
+                       // If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
+                       $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+                       if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
+                               System::httpExit(404);
+                       }
                }
 
                $data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index f002e72feb01d78cb6f2a60a7bd16afbecdd3d93..cb5412c161474cfd322f076480a0565d0985134d 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -2,7 +2,7 @@
        {{* {{$langselector}} *}}
 
        <div id="site-location">{{$sitelocation}}</div>
-       <div id="banner">{{$banner}}</div>
+       <div id="banner">{{$banner nofilter}}</div>
 </header>
 <nav>
        <ul>

diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index 0c55b58869370a1a61938b12aa83eabe60405d3b..757371677b37668b67529de89e1cca49388ab7f9 100644 (file)
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -1,6 +1,6 @@
 
 <nav>
-       <span id="banner">{{$banner}}</span>
+       <span id="banner">{{$banner nofilter}}</span>
 
        <div id="notifications">        
                {{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}