From dcb8995b1acc193fd210a6980e23ff5f65738aff Mon Sep 17 00:00:00 2001 From: Sarjuuk Date: Wed, 5 Jan 2022 23:29:35 +0100 Subject: [PATCH] Markup * allow 'auto' as width for tables * db tag 'money' may include currency AND items --- includes/markup.class.php | 3 ++- static/js/Markup.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/markup.class.php b/includes/markup.class.php index 8a4f3fc8..cb69efc5 100644 --- a/includes/markup.class.php +++ b/includes/markup.class.php @@ -31,7 +31,8 @@ class Markup $match[1] = 'achievement'; else if ($match[1] == 'icondb') $match[1] = 'icon'; - else if ($match[1] == 'money') + + if ($match[1] == 'money') { if (stripos($match[0], 'items')) { diff --git a/static/js/Markup.js b/static/js/Markup.js index 72b7cab9..c3c2f052 100644 --- a/static/js/Markup.js +++ b/static/js/Markup.js @@ -2798,7 +2798,7 @@ var Markup = { border: { req: false, valid: /^[0-9]+$/ }, cellspacing: { req: false, valid: /^[0-9]+$/ }, cellpadding: { req: false, valid: /^[0-9]+$/ }, - width: { req: false, valid: /^[0-9]+(px|em|\%)$/ } + width: { req: false, valid: /^([0-9]+(px|em|\%)|auto)$/ } }, toHtml: function(attr) {