Fix for warnings in smarty templates

diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
index c6938e29e2704318e43db0301822cc87e1297bf4..0c1d6350347ac34518101f331e61b6449fbb5441 100644 (file)
--- a/view/templates/search_item.tpl
+++ b/view/templates/search_item.tpl
@@ -47,9 +47,9 @@
                </div>
                <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}">
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
+                               {{if $item.drop && $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
                        </div>
-                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+                               {{if $item.drop && $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        <div class="wall-item-delete-end"></div>
                </div>
        </div>

diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index d0e3b51eab53f22f3fd7d09fb0a33872cb350d16..763a68bde676c8be6570ea395b7ebfd696e8bfe7 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -121,9 +121,9 @@
                        </div>
                        {{/if}}
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}">
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
+                               {{if $item.drop && $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
                        </div>
-                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+                               {{if $item.drop && $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        <div class="wall-item-delete-end"></div>
                </div>
        </div>

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 2fbff14d781c76e836cdce64c5fc8d73554e01cc..39e66751f8a301b11a27ba29b0ab423b5e0441ab 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -1,6 +1,6 @@
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
-       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+       {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
        {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
@@ -245,7 +245,7 @@
                                                        </li>
                                                {{/if}}
 
-                                               {{if $item.drop.dropping}}
+                                               {{if $item.drop && $item.drop.dropping}}
                                                        <li role="menuitem">
                                                                <a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
                                                        </li>
@@ -270,7 +270,7 @@
                                {{/if}}
 
                                        <span class="pull-right checkbox">
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                                <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                                <label for="checkbox-{{$item.id}}"></label>
                                {{/if}}

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 8f03cb5c9da3c08d78e28f49692439b75597036f..55858d811ea9dba5c773a830623c7bd1c46fe710 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -336,7 +336,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{/if}}
 
                        {{* Put additional actions in a dropdown menu *}}
-                       {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping)}}
+                       {{if $item.menu && ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || ($item.drop && $item.drop.dropping))}}
                                <span role="presentation" class="separator"></span>
                                <span class="more-links btn-group{{if $item.thread_level > 1}} dropup{{/if}}">
                                        <button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i>&nbsp;{{$item.menu}}</button>
@@ -385,7 +385,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
-                                               {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || $item.drop.dropping)}}
+                                               {{if ($item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread) && ($item.ignore || ($item.drop && $item.drop.dropping))}}
                                                <li role="separator" class="divider"></li>
                                                {{/if}}
 
@@ -398,7 +398,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                        </li>
                                                {{/if}}
 
-                                               {{if $item.drop.dropping}}
+                                               {{if $item.drop && $item.drop.dropping}}
                                                <li role="menuitem">
                                                        <a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
                                                </li>
@@ -429,7 +429,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{/if}}
 
                                <span class="pull-right checkbox">
-                       {{if $item.drop.pagedrop}}
+                       {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                        <label for="checkbox-{{$item.id}}"></label>
                        {{/if}}
@@ -506,7 +506,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                </div>
                        {{/if}}
 
-                       {{if $item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || $item.drop.dropping}}
+                       {{if $item.edpost || $item.tagger || $item.filer || $item.pin || $item.star || $item.follow_thread || $item.ignore || ($item.drop && $item.drop.dropping)}}
                                <div class="more-links btn-group{{if $item.thread_level > 1}} dropup{{/if}}">
                                        <button type="button" class="btn btn-sm dropdown-toggle" data-toggle="dropdown" id="dropdownMenuOptions-{{$item.id}}" aria-haspopup="true" aria-expanded="false" title="{{$item.menu}}"><i class="fa fa-ellipsis-h" aria-hidden="true"></i></button>
                                        <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dropdownMenuOptions-{{$item.id}}">
@@ -548,7 +548,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
-                                               {{if $item.ignore || $item.drop.dropping}}
+                                               {{if $item.ignore || ($item.drop && $item.drop.dropping)}}
                                                        <li role="separator" class="divider"></li>
                                                {{/if}}
 
@@ -561,7 +561,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                </li>
                                                {{/if}}
 
-                                               {{if $item.drop.dropping}}
+                                               {{if $item.drop && $item.drop.dropping}}
                                                        <li role="menuitem">
                                                        <a class="btn-link navicon delete" href="javascript:dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</a>
                                                </li>
@@ -571,7 +571,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                </div>
                        {{/if}}
                                <span class="pull-right checkbox">
-                       {{if $item.drop.pagedrop}}
+                       {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                        <label for="checkbox-{{$item.id}}"></label>
                        {{/if}}

diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
index 903138874afa66ba995b78450a1baae8d65f6058..b5c6af7e75b4319771e76bee395eb84d69ea03b5 100644 (file)
--- a/view/theme/quattro/templates/search_item.tpl
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -71,10 +71,10 @@
 
                        <div class="wall-item-actions-tools">
 
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}

diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
index 5f2021b3ef6fcf9284921fae63d2b54146afee98..3aa9d3ad4598f4a074f8fdcba65fa286f626f9b1 100644 (file)
--- a/view/theme/quattro/templates/wall_item_tag.tpl
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -40,10 +40,10 @@
                        {{$item.ago}} {{$item.body_html nofilter}}
                </div>
                        <div class="wall-item-tools">
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 29dae72b43c523ec54ad9ea94de10ca0187a41fb..1382222c1f08e7dde2f0f8f580accc160c1e73fd 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -145,10 +145,10 @@
 
                        <div class="wall-item-actions-tools">
 
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}

diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
index 7675c2db17b705be4ee0f01537b886ec438cb97a..94d713267bfd97e3394a7ac15a7ae9fa465a4dfa 100644 (file)
--- a/view/theme/smoothly/templates/search_item.tpl
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -26,9 +26,9 @@
                </div>
                <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}">
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
+                               {{if $item.drop && $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>{{/if}}
                        </div>
-                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+                               {{if $item.drop && $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        <div class="wall-item-delete-end"></div>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}">

diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index 773938f3c5853766a178dee03b693aa4bc3e97f4..53602cc8fcee4e153bd3adecfd0e4f8577792ad7 100644 (file)
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -135,12 +135,12 @@
                        {{/if}}
 
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}">
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
                                {{/if}}
                        </div>
 
-                       {{if $item.drop.pagedrop}}
+                       {{if $item.drop && $item.drop.pagedrop}}
                        <input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />
                        {{/if}}
 

diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
index 44fb6804d3cdd99d18039cc9b18d2e7d1bd6c847..2441c80fecd5e1e1978a29a522ee242481e83798 100644 (file)
--- a/view/theme/vier/templates/search_item.tpl
+++ b/view/theme/vier/templates/search_item.tpl
@@ -75,10 +75,10 @@
 
                        <div class="wall-item-actions-tools">
 
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}

diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl
index 01207ab117ce00d550a3cfaa8a5e851c24641cec..c12cb7085f8b1a79c24cfa2f1dc2bac4550c14a6 100644 (file)
--- a/view/theme/vier/templates/wall_item_tag.tpl
+++ b/view/theme/vier/templates/wall_item_tag.tpl
@@ -40,10 +40,10 @@
                        {{$item.ago}} {{$item.body_html nofilter}}
                </div>
                        <div class="wall-item-tools">
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index f2bd02e7e7caf67db9cc40ad28a610487386b417..7d851d0015a53e080d2896db1c47a2a1ac3d9dee 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -162,10 +162,10 @@
 
                        <div class="wall-item-actions-tools">
 
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
+                               {{if $item.drop && $item.drop.dropping}}
                                        <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
                                {{/if}}
                                {{if $item.edpost}}