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

This commit is contained in:
Benjamin Southall 2019-08-08 21:20:48 +10:00
parent 3527e5703b
commit d900279707
11 changed files with 32 additions and 32 deletions

View file

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

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> <p style="text-align:center" class="unimportant">({% trans 'No private messages for you.' %})</p>
{% else %} {% else %}
<table class="modlog"> <table class="modlog">

View file

@ -1,5 +1,5 @@
<script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script> <script src="{{ config.additional_javascript_url }}js/mod/recent_posts.js"></script>
{% if not posts|count %} {% if posts|default([])|length %}
<p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p> <p style="text-align:center" class="unimportant">({% trans 'There are no active posts.' %})</p>
{% else %} {% else %}
<h4>Viewing last {{ limit|e }} posts</h4> <h4>Viewing last {{ limit|e }} posts</h4>

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> <p style="text-align:center" class="unimportant">({% trans 'There are no themes available.' %})</p>
{% else %} {% else %}
<table class="modlog"> <table class="modlog">

View file

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

View file

@ -47,10 +47,10 @@
</td> </td>
{% endif %} {% endif %}
<td> <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> <a style="float:left;text-decoration:none" href="?/users/{{ user.id }}/promote/{{ user.promote_token }}" title="{% trans 'Promote' %}">&#9650;</a>
{% endif %} {% 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> <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 %} {% endif %}
{% if mod|hasPermission(config.mod.modlog) %} {% if mod|hasPermission(config.mod.modlog) %}

View file

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

View file

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

View file

@ -14,7 +14,7 @@
</header> </header>
<div class="ban"> <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> <p style="text-align:center" class="unimportant">{% trans %}(No news to show.){% endtrans %}</p>
{% else %} {% else %}
{% for entry in news %} {% for entry in news %}

View file

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

View file

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