fnv/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes count(): Parameter must be an array or an object that implements Countable as well as PHP 7.3 regression in users from upstream 3a41c24e6e5bcea2f4b9f328ddf5ff0cb8a8b2e8

Browse Source
This commit is contained in:
Benjamin Southall 2019-08-08 21:20:48 +10:00
parent 309c4db302
commit 896558fadd
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/mod/dashboard.html
View File

@ -65,7 +65,7 @@
{% endif %}
{% if config.mod.dashboard_links|count %}
{% if config.mod.dashboard_links|length %}
{% for label,link in config.mod.dashboard_links %}
<li><a href="{{ link }}">{{ label }}</a></li>

2
templates/mod/inbox.html
View File

@ -1,4 +1,4 @@
{% if messages|count == 0 %}
{% if messages|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">({% trans 'No private messages for you.' %})</p>
{% else %}
<table class="modlog">

38
templates/mod/recent_posts.html
View File

@ -1,19 +1,19 @@
<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script>
{% if not posts|count %}
<p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p>
{% else %}
<h4>Viewing last {{ limit|e }} posts</h4>
<p>View <a href="?/recent/25"> 25 </a>|<a href="?/recent/50"> 50 </a>|<a href="?/recent/100"> 100 </a></p>
<a href="javascript:void(0)" id="erase-local-data" style="float:right; clear:both">Erase local data</a></div>
{% for post in posts %}
{% if not post.thread %}
{% set thread = post.id %}
{% else %}
{% set thread = post.thread %}
{% endif %}
<div class="post-wrapper" data-board="{{ post.board }}"><hr/><a class="eita-link" id="eita-{{ post.board }}-{{ thread }}" href="?/{{ post.board }}/{{ config.dir.res }}{{ thread }}.html#{{ post.id }}">/{{ post.board }}/{{ post.id }}</a><br>
{{ post.built }}
</div>
{% endfor %}
{% endif %}
<a href="/mod.php?/recent/{{ limit|e }}&amp;last={{ last_time|e }}">Next {{ limit }} posts</a>
<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script>
{% if posts|default([])|length %}
<p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p>
{% else %}
<h4>Viewing last {{ limit|e }} posts</h4>
<p>View <a href="?/recent/25"> 25 </a>|<a href="?/recent/50"> 50 </a>|<a href="?/recent/100"> 100 </a></p>
<a href="javascript:void(0)" id="erase-local-data" style="float:right; clear:both">Erase local data</a></div>
{% for post in posts %}
{% if not post.thread %}
{% set thread = post.id %}
{% else %}
{% set thread = post.thread %}
{% endif %}
<div class="post-wrapper" data-board="{{ post.board }}"><hr/><a class="eita-link" id="eita-{{ post.board }}-{{ thread }}" href="?/{{ post.board }}/{{ config.dir.res }}{{ thread }}.html#{{ post.id }}">/{{ post.board }}/{{ post.id }}</a><br>
{{ post.built }}
</div>
{% endfor %}
{% endif %}
<a href="/mod.php?/recent/{{ limit|e }}&amp;last={{ last_time|e }}">Next {{ limit }} posts</a>

2
templates/mod/themes.html
View File

@ -1,4 +1,4 @@
{% if themes|count == 0 %}
{% if themes|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">({% trans 'There are no themes available.' %})</p>
{% else %}
<table class="modlog">

2
templates/mod/user.html
View File

@ -87,7 +87,7 @@
</ul>
</form>
{% if logs|count > 0 %}
{% if logs|default([])|length > 0 %}
<table class="modlog" style="width:600px">
<tr>
<th>{% trans 'IP address' %}</th>

4
templates/mod/users.html
View File

@ -47,10 +47,10 @@
</td>
{% endif %}
<td>
{% if mod|hasPermission(config.mod.promoteusers) and user.type < constant(config.mod.groups[0:-1]|last) %}
{% if mod|hasPermission(config.mod.promoteusers) and user.type < constant(config.mod.groups[0:-1]|last|upper) %}
<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote/{{ user.promote_token }}" title="{% trans 'Promote' %}">&#9650;</a>
{% endif %}
{% if mod|hasPermission(config.mod.promoteusers) and user.type > constant(config.mod.groups|first) %}
{% if mod|hasPermission(config.mod.promoteusers) and user.type > constant(config.mod.groups|first|upper) %}
<a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/demote/{{ user.demote_token }}" title="{% trans 'Demote' %}"{% if mod.id == user.id %} onclick="return confirm('{% trans 'Are you sure you want to demote yourself?' %}')"{% endif %}>&#9660;</a>
{% endif %}
{% if mod|hasPermission(config.mod.modlog) %}

6
templates/mod/view_ip.html
View File

@ -18,7 +18,7 @@
<legend>{{ notes|count }} {% trans notes_on_record %}</legend>
</legend>
{% if notes|count > 0 %}
{% if notes|default([])|length > 0 %}
<table class="modlog">
<tr>
<th>{% trans 'Staff' %}</th>
@ -81,7 +81,7 @@
</fieldset>
{% endif %}
{% if bans|count > 0 and mod|hasPermission(config.mod.view_ban) %}
{% if bans|default([])|length > 0 and mod|hasPermission(config.mod.view_ban) %}
<fieldset id="bans">
{% set bans_on_record = 'ban' ~ (bans|count != 1 ? 's' : '') ~ ' on record' %}
<legend>{{ bans|count }} {% trans bans_on_record %}</legend>
@ -174,7 +174,7 @@
</fieldset>
{% endif %}
{% if logs|count > 0 %}
{% if logs|default([])|length > 0 %}
<fieldset id="history">
<legend>History</legend>
<table class="modlog" style="width:100%">

2
templates/themes/basic/index.html
View File

@ -24,7 +24,7 @@
<img src="static/lain_is_cute_datass_small_teal.png" alt="mascot"/>
</center>
<div class="ban">
{% if news|count == 0 %}
{% if news|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">(No news to show.)</p>
{% else %}
{% for entry in news %}

2
templates/themes/categories/news.html
View File

@ -14,7 +14,7 @@
</header>
<div class="ban">
{% if news|count == 0 %}
{% if news|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p>
{% else %}
{% for entry in news %}

2
templates/themes/frameset/news.html
View File

@ -13,7 +13,7 @@
</header>
<div class="ban">
{% if news|count == 0 %}
{% if news|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">(No news to show.)</p>
{% else %}
{% for entry in news %}

2
templates/themes/recent/recent.html
View File

@ -36,7 +36,7 @@
<br>
<div class="ban" id="global3">
<h2>Latest News</h2>
{% if recent_news|count == 0 %}
{% if recent_news|default([])|length == 0 %}
<p style="text-align:center" class="unimportant">(No news to show.)</p>
{% else %}
{% for entry in recent_news %}