Merge branch 'master' into develop

diff --git a/view/theme/frio/js/mod_display.js b/view/theme/frio/js/mod_display.js
index 86608821e5cd2ca86190ed1c8742216da5441ad3..ed126d60cdb19f2f4417d1fca9434b9cac30a587 100644 (file)
--- a/view/theme/frio/js/mod_display.js
+++ b/view/theme/frio/js/mod_display.js
@@ -4,8 +4,9 @@
 
 // Catch the GUID from the URL
 var itemGuid = window.location.pathname.split("/").pop();
+var itemGuidSafe = itemGuid.replace(/%.*/, '');
 
 $(window).load(function(){
        // Scroll to the Item by its GUID
-       scrollToItem('item-'+itemGuid);
+       scrollToItem('item-' + itemGuidSafe);
 });

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index e71dc7b84c336fb3b2d3dcb7ee1216614449f40e..1977f541c231562bad5b0d529b1ac3fb811f8ed8 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -68,9 +68,9 @@ as the value of $top_child_total (this is done at the end of this file)
 
 {{* Use a different div container in dependence max thread-level = 7 *}}
 {{if $item.thread_level<7}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid}}"><!-- wall-item-container -->
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_{{$item.thread_level}} {{if $item.thread_level==1}}panel-body h-entry{{else}}u-comment h-cite{{/if}}" id="item-{{$item.guid|regex_replace:'/%.*/':''}}"><!-- wall-item-container -->
 {{else}}
-<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid}}">
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} {{$item.network}} thread_level_7 u-comment h-cite" id="item-{{$item.guid|regex_replace:'/%.*/':''}}">
  {{/if}}
        <div class="media">
                {{* Put addional actions in a top-right dropdown menu *}}