Merge branch 'next-minor' into develop

Changelog.md

@@ -22,6 +22,7 @@
 
 ## Refactor
 * Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
+* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
 
 ## Bug fixes
 * Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)

app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs

@@ -39,11 +39,11 @@
             {{/if}}
             <span class="post-time">
               {{#if root}}
-                <a href="/posts/{{root.id}}">
+                <a href="/posts/{{root.guid}}">
                   <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
                 </a>
               {{else}}
-                <a href="/posts/{{id}}">
+                <a href="/posts/{{guid}}">
                   <time datetime="{{created_at}}" title="{{localTime created_at}}" />
                 </a>
               {{/if}}
@@ -91,7 +91,7 @@
           </span>
           <div class="post-context">
             <span class="post-time">
-              <a href="/posts/{{id}}">
+              <a href="/posts/{{guid}}">
                 <time datetime="{{created_at}}" title="{{localTime created_at}}" />
               </a>
             </span>

app/assets/templates/stream-element_tpl.jst.hbs

@@ -24,7 +24,7 @@
             <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />
           </a>
 
-          <a href="/posts/{{id}}" class="permalink" title="{{t "stream.permalink"}}">
+          <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">
             <i class="entypo-link"></i>
           </a>
         {{/if}}