Merge branch 'main' into new/report-notifications

MbinOrg · Jun 7, 2024 · bc5e8b1 · bc5e8b1
2 parents 22e72fa + 1e6d471
commit bc5e8b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -189,6 +189,13 @@ For developers:
         </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/CocoPoops">
+            <img src="https://avatars.githubusercontent.com/u/7891055?v=4" width="100;" alt="CocoPoops"/>
+            <br />
+            <sub><b>CocoPoops</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/garrettw">
             <img src="https://avatars.githubusercontent.com/u/84885?v=4" width="100;" alt="garrettw"/>
@@ -210,13 +217,6 @@ For developers:
             <sub><b>Bryson</b></sub>
         </a>
     </td>
-    <td align="center">
-        <a href="https://github.com/CocoPoops">
-            <img src="https://avatars.githubusercontent.com/u/7891055?v=4" width="100;" alt="CocoPoops"/>
-            <br />
-            <sub><b>CocoPoops</b></sub>
-        </a>
-    </td>
     <td align="center">
         <a href="https://github.com/vpzomtrrfrt">
             <img src="https://avatars.githubusercontent.com/u/3528358?v=4" width="100;" alt="vpzomtrrfrt"/>

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN chown -R $USER:$GROUP /usr/local/etc/php-fpm.d
 
 ####################
 
-FROM caddy:2.8.1-builder-alpine AS builder-caddy
+FROM caddy:2.8.4-builder-alpine AS builder-caddy
 
 # Build Caddy with the Mercure and Vulcain and brotil cache modules
 RUN xcaddy build \

diff --git a/templates/modlog/_blocks.html.twig b/templates/modlog/_blocks.html.twig
@@ -44,9 +44,15 @@
 {% endblock %}
 
 {% block log_moderator_add %}
-    {{ component('user_inline', {user: log.actingUser}) }} {{ 'magazine_log_mod_added'|trans }}: {{ component('user_inline', {user: log.user}) }}
+    {% if log.actingUser is not same as null %}
+        {{ component('user_inline', {user: log.actingUser}) }}
+    {% endif %}
+    {{ 'magazine_log_mod_added'|trans }}: {{ component('user_inline', {user: log.user}) }}
 {% endblock %}
 
 {% block log_moderator_remove %}
-    {{ component('user_inline', {user: log.actingUser}) }} {{ 'magazine_log_mod_removed'|trans }}: {{ component('user_inline', {user: log.user}) }}
+    {% if log.actingUser is not same as null %}
+        {{ component('user_inline', {user: log.actingUser}) }}
+    {% endif %}
+    {{ 'magazine_log_mod_removed'|trans }}: {{ component('user_inline', {user: log.user}) }}
 {% endblock %}