Issue 8836: Point the event to the local post

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 145632fdfcefb8d34e0c3fbc22bb27b4aa2f2939..6f8ed123c17396bc4fd6e45f8405e13e33018967 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -617,10 +617,8 @@ class Event
                        }
 
                        $author_link = $event['author-link'];
-                       $plink       = $event['plink'];
 
                        $event['author-link'] = Contact::magicLink($author_link);
-                       $event['plink']       = Contact::magicLink($author_link, $plink);
 
                        $html = self::getHTML($event);
                        $event['summary']  = BBCode::convert(Strings::escapeHtml($event['summary']));
@@ -640,7 +638,7 @@ class Event
                                'is_first' => $is_first,
                                'item'     => $event,
                                'html'     => $html,
-                               'plink'    => [$event['plink'], DI::l10n()->t('link to source'), '', ''],
+                               'plink'    => Item::getPlink($event),
                        ];
                }
 

diff --git a/view/templates/event.tpl b/view/templates/event.tpl
index f318c909ba0a83e15045e52855dc1f9b2428444e..f9f790c8586f5b38ca51c81bcd803a0b78c842d1 100644 (file)
--- a/view/templates/event.tpl
+++ b/view/templates/event.tpl
@@ -4,7 +4,7 @@
        
        {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
        {{$event.html nofilter}}
-       {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+       {{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.title}}" target="_blank" rel="noopener noreferrer" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
        {{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}}
        {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link icon s22 delete"></a>{{/if}}

diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
index 9a6f747e5715fd362b7a75633163fc664ef52fd3..3af211284a9a70075a5036cbbb0ac2f46dd67332 100644 (file)
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@ -18,7 +18,7 @@
                                {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
                                {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
                                {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
-                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn" aria-label="{{$event.plink.1}}"><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.title}}" class="plink-event-link btn" aria-label="{{$event.plink.1}}"><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
                        </div>
                        <div class="clear"></div>
                </div>