From a27abdde8b50318652c7e5758eed4ef13c3449b8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 19 Feb 2007 18:08:45 +0000 Subject: [PATCH] Tweaks to r19987: * Don't add an 'id' attribute for custom toolbar buttons where the custom array doesn't include an id, for compatibility with existing settings. * Fix corrupted, but previously also incorrect, encoding on regex for currencies in sortable table setup. Using \u escape sequences for pound and euro; possibly other symbols need to be added? * Bump $wgStyleVersion --- includes/DefaultSettings.php | 2 +- skins/common/wikibits.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index fbfd49374c..1f63f6cc78 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1117,7 +1117,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches don't keep obsolete copies of global * styles. */ -$wgStyleVersion = '56'; +$wgStyleVersion = '57'; # Server-side caching: diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index a093498548..7889c396a3 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -349,7 +349,7 @@ function mwInsertEditButton(parent, item) { image.width = 23; image.height = 22; image.className = "mw-toolbar-editbutton"; - image.id = item.imageId; + if (item.imageId) image.id = item.imageId; image.src = item.imageFile; image.border = 0; image.alt = item.speedTip; @@ -1084,7 +1084,7 @@ function ts_resortTable(lnk) { sortfn = ts_sort_date; if (itm.match(/^\d\d[\/.-]\d\d[\/.-]\d\d$/)) sortfn = ts_sort_date; - if (itm.match(/^[$Û¢]/)) + if (itm.match(/^[\u00a3$\u20ac]/)) // pound dollar euro sortfn = ts_sort_currency; if (itm.match(/^[\d.,]+\%?$/)) sortfn = ts_sort_numeric; -- 2.20.1