Normalize item_photo_menu template variable name

diff --git a/include/conversation.php b/include/conversation.php
index fd7303fa46f4d97090c539ea0df68d6eca2306f4..8b658521ed7a4e2a877fadd858121f3496de0b04 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -595,7 +595,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
                                        'linktitle' => DI::l10n()->t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
                                        'profile_url' => $profile_link,
-                                       'item_photo_menu' => item_photo_menu($item),
+                                       'item_photo_menu_html' => item_photo_menu($item),
                                        'name' => $profile_name,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 81762330924683bdcf003c72a22decf29c0c6c6c..6e5088f1677bc12019cc8415f15412ac80bd93a5 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -444,8 +444,8 @@ class Post
                        'wall'            => DI::l10n()->t('Wall-to-Wall'),
                        'vwall'           => DI::l10n()->t('via Wall-To-Wall:'),
                        'profile_url'     => $profile_link,
-                       'item_photo_menu' => item_photo_menu($item),
                        'name'            => $name_e,
+                       'item_photo_menu_html' => item_photo_menu($item),
                        'thumb'           => DI::baseUrl()->remove($item['author-avatar']),
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,

diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
index 32d1823ca5cf42805dc311305c3ef9c382b9beec..4c6dcb722678360e86bfcdc9b1bfaec639324d54 100644 (file)
--- a/view/templates/search_item.tpl
+++ b/view/templates/search_item.tpl
@@ -11,7 +11,7 @@
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
-                                               {{$item.item_photo_menu nofilter}}
+                                               {{$item.item_photo_menu_html nofilter}}
                                        </ul>
                                </div>
                        </div>

diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index c805a2921e335854adba0479a5753bf310fcea93..235889930f692852d041b21b23f33fa488a58e3e 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -39,7 +39,7 @@
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        {{$item.item_photo_menu nofilter}}
+                        {{$item.item_photo_menu_html nofilter}}
                     </ul>
                 </div>
 

diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
index dcbe827909f807715166b18303f35b0478891025..e05e37621e1b6608898fb4d9f656a7e839b9f87f 100644 (file)
--- a/view/theme/quattro/templates/search_item.tpl
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -15,7 +15,7 @@
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
 
                        </div>

diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
index 4e0c230cb0827f3bcc2625447aa17ac9b22d0ece..93e6abaef6f910eda1f3241a7211400d944236cf 100644 (file)
--- a/view/theme/quattro/templates/wall_item_tag.tpl
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -30,7 +30,7 @@
                                        <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
                                
                        </div>

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 612e646f04595eadf87fbf36d81f4030d0ee602d..6c557507bf6aac43194c41033631f6a139248ce9 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -39,7 +39,7 @@
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
 
                        </div>

diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
index 1e5b5c58018ba25eeedb22193b87307f06b82951..5d0764de4a10d798b380f8f23f0e23bac8782469 100644 (file)
--- a/view/theme/smoothly/templates/search_item.tpl
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -10,7 +10,7 @@
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
-                                               {{$item.item_photo_menu nofilter}}
+                                               {{$item.item_photo_menu_html nofilter}}
                                        </ul>
                                </div>
                        </div>

diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index 198b7850199b46a0ac3d98887cc4b4319e456bdc..d5138978dd12ae8df283c02ebd2b56a9e643f4d6 100644 (file)
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -31,7 +31,7 @@
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        {{$item.item_photo_menu nofilter}}
+                        {{$item.item_photo_menu_html nofilter}}
                     </ul>
                 </div>
 

diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
index b21b3de9fd11224dce931d36f47bf254454b68ee..278beb01745bde521e70774e214021bf6af07bee 100644 (file)
--- a/view/theme/vier/templates/search_item.tpl
+++ b/view/theme/vier/templates/search_item.tpl
@@ -16,7 +16,7 @@
                                        <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <!-- <a rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a> -->
                                <ul role="menu" aria-haspopup="true" class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
 
                        </div>

diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl
index f52da7c8d58d3803b41d20b3467b63869e085fea..960cb171af3d01f39b5b5cfce97d733c59ac4904 100644 (file)
--- a/view/theme/vier/templates/wall_item_tag.tpl
+++ b/view/theme/vier/templates/wall_item_tag.tpl
@@ -30,7 +30,7 @@
                                <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
                                        <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
                                
                        </div>

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 29d6840c7af5a2e5db65c79dd124051ea5f8703b..aedcf34e4509f763beb58788815ac1ad25fc8ac2 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -40,7 +40,7 @@
                                <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
                                        <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
 
                        </div>