From 1e7b6b00a75ed8d1ede4ad87e715ad3c21a221e9 Mon Sep 17 00:00:00 2001
From: John Hsu <john.hsu@ubc.ca>
Date: Wed, 6 Sep 2023 19:47:32 -0700
Subject: [PATCH] EDIT mediawiki new logo config for mw1.39

The old $wgLogo config is deprecated. The new $wgLogos config allows you
define many logo variations. Most of it is for backward compatibility.
The new mediawikiLogo.icon value is required as it is the only one used
by new themes from now on, all the other values will be deprecated in
the future.

Since we still have the old theme available as an option for users to
pick, we'll still use some of the backward compat logo values:

mediawikiLogo.legacy1x: for the old 1x versions of the logo
mediawikiLogo.legacy2x: for the old 2x versions of the logo

I'm not sure if both is required, but I got odd results when only one or
the other is present, so putting both in to be safe. We only have the 2x
version of the logo previously, so will have to upload a 1x version.
---
 mediawiki/Chart.yaml             |  4 ++--
 mediawiki/templates/_helpers.tpl | 12 ++++++++++--
 mediawiki/values.yaml            |  9 ++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/mediawiki/Chart.yaml b/mediawiki/Chart.yaml
index a3479f5..89d579d 100644
--- a/mediawiki/Chart.yaml
+++ b/mediawiki/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: mediawiki
-version: 0.6.7
-appVersion: 1.35.7
+version: 0.6.8
+appVersion: 1.39.4
 description: Extremely powerful, scalable software and a feature-rich wiki implementation
   that uses PHP to process and display data stored in a database.
 keywords:
diff --git a/mediawiki/templates/_helpers.tpl b/mediawiki/templates/_helpers.tpl
index b5c5b2f..8ed5773 100644
--- a/mediawiki/templates/_helpers.tpl
+++ b/mediawiki/templates/_helpers.tpl
@@ -104,8 +104,16 @@ env:
 - name: MEDIAWIKI_SITE_LANG
   value: {{ .Values.mediawikiLang | quote }}
 {{- if .Values.mediawikiLogo }}
-- name: MEDIAWIKI_LOGO
-  value: {{ .Values.mediawikiLogo | quote }}
+- name: MEDIAWIKI_LOGO_ICON
+  value: {{ .Values.mediawikiLogo.icon | quote }}
+{{- if .Values.mediawikiLogo.legacy1x }}
+- name: MEDIAWIKI_LOGO_LEGACY1X
+  value: {{ .Values.mediawikiLogo.legacy1x | quote }}
+{{- end }}
+{{- if .Values.mediawikiLogo.legacy2x }}
+- name: MEDIAWIKI_LOGO_LEGACY2X
+  value: {{ .Values.mediawikiLogo.legacy2x | quote }}
+{{- end }}
 {{- end }}
 {{- if .Values.mediawikiUploadPath  }}
 - name: MEDIAWIKI_UPLOAD_PATH
diff --git a/mediawiki/values.yaml b/mediawiki/values.yaml
index f07a6db..fea5fe6 100644
--- a/mediawiki/values.yaml
+++ b/mediawiki/values.yaml
@@ -39,7 +39,14 @@ mediawikiName: My Wiki
 mediawikiLang: en
 
 # Top right corner logo
-# mediawikiLogo:
+#mediawikiLogo:
+#  # used by new themes (e.g. 2022's Vector theme), should be a square, ideally
+#  # 50x50 pixels for SVGs, 100x100 pixels for regular images. Required.
+#  icon: '/path/to/img.svg'
+#  # for old themes(e.g. pre-2022's Vector legacy theme). Required if still
+#  # using old themes, but might be deprecated in the future.
+#  legacy1x: '/path/to/img2.svg'
+#  legacy2x: '/images/d/d5/Ubcwiki_logo_2x.png'
 
 # Comma separated extension list
 mediawikiExts: ""