From 463577cdbc8d1fc623b214cee21d736a8864cbbe Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Fri, 17 Jun 2022 12:11:27 +1000 Subject: [PATCH] Use array|null for the wordmark/tagline type Per Thiemo's comments at Id2712e2af3d8f33fd4. Follow up to Ie33f8edf075f1216881428ec6aa29c. Change-Id: Idea3dede510e0e46265a2f55665b99ef5c0029c3 --- docs/config-schema.yaml | 4 ++-- includes/MainConfigSchema.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/config-schema.yaml b/docs/config-schema.yaml index c1b4c0b98b3..735686a7e64 100644 --- a/docs/config-schema.yaml +++ b/docs/config-schema.yaml @@ -213,13 +213,13 @@ config-schema: The `2x` key is a path to the 2x version of square logo The `svg` key is a path to the svg version of square logo The `icon` key is a path to the version of the logo without wordmark and tagline - The `wordmark` key may be false or an array with the following fields + The `wordmark` key may be null or an array with the following fields - `src` path to wordmark version - `1x` path to svg wordmark version (if you want to support browsers with SVG support with an SVG logo) - `width` width of the logo in pixels - `height` height of the logo in pixels - The `tagline` key may be false or array with the following fields + The `tagline` key may be null or array with the following fields - `src` path to tagline image - `width` width of the tagline in pixels - `height` height of the tagline in pixels diff --git a/includes/MainConfigSchema.php b/includes/MainConfigSchema.php index d58e62bc548..e18e182eeb2 100644 --- a/includes/MainConfigSchema.php +++ b/includes/MainConfigSchema.php @@ -512,13 +512,13 @@ class MainConfigSchema { * The `2x` key is a path to the 2x version of square logo * The `svg` key is a path to the svg version of square logo * The `icon` key is a path to the version of the logo without wordmark and tagline - * The `wordmark` key may be false or an array with the following fields + * The `wordmark` key may be null or an array with the following fields * - `src` path to wordmark version * - `1x` path to svg wordmark version (if you want to * support browsers with SVG support with an SVG logo) * - `width` width of the logo in pixels * - `height` height of the logo in pixels - * The `tagline` key may be false or array with the following fields + * The `tagline` key may be null or array with the following fields * - `src` path to tagline image * - `width` width of the tagline in pixels * - `height` height of the tagline in pixels