r19768 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r19767‎ | r19768 | r19769 >
Date:22:35, 4 February 2007
Author:brion
Status:old
Tags:
Comment:
Merge from trunk:
* Security fix for sortable tables JavaScript
Modified paths:
  • /branches/REL1_9/phase3/RELEASE-NOTES (modified) (history)
  • /branches/REL1_9/phase3/includes/DefaultSettings.php (modified) (history)
  • /branches/REL1_9/phase3/skins/common/sorttable.js (modified) (history)
  • /branches/REL1_9/phase3/skins/common/wikibits.js (modified) (history)

Diff [purge]

Index: branches/REL1_9/phase3/skins/common/wikibits.js
@@ -853,7 +853,7 @@
854854
855855 function sortableTables() {
856856 if (getElementsByClassName(document, "table", "sortable").length != 0) {
857 - document.write('<script type="text/javascript" src="'+stylepath+'/common/sorttable.js"></script>');
 857+ document.write('<script type="text/javascript" src="'+stylepath+'/common/sorttable.js?1"></script>');
858858 }
859859 }
860860
Index: branches/REL1_9/phase3/skins/common/sorttable.js
@@ -55,9 +55,8 @@
5656 // We have a first row: assume it's the header, and make its contents clickable links
5757 for (var i=0;i<firstRow.cells.length;i++) {
5858 var cell = firstRow.cells[i];
59 - var txt = ts_getInnerText(cell);
6059 if (cell.className != "unsortable" && cell.className.indexOf("unsortable") == -1) {
61 - cell.innerHTML = txt+'&nbsp;&nbsp;<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;"><span class="sortarrow"><img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
 60+ cell.innerHTML += '&nbsp;&nbsp;<a href="#" class="sortheader" onclick="ts_resortTable(this);return false;"><span class="sortarrow"><img src="'+ image_path + image_none + '" alt="&darr;"/></span></a>';
6261 }
6362 }
6463 if (alternate_row_colors) {
Index: branches/REL1_9/phase3/includes/DefaultSettings.php
@@ -32,7 +32,7 @@
3333 $wgConf = new SiteConfiguration;
3434
3535 /** MediaWiki version number */
36 -$wgVersion = '1.9.1';
 36+$wgVersion = '1.9.2';
3737
3838 /** Name of the site. It must be changed in LocalSettings.php */
3939 $wgSitename = 'MediaWiki';
@@ -1096,7 +1096,7 @@
10971097 * to ensure that client-side caches don't keep obsolete copies of global
10981098 * styles.
10991099 */
1100 -$wgStyleVersion = '42a';
 1100+$wgStyleVersion = '42b';
11011101
11021102
11031103 # Server-side caching:
Index: branches/REL1_9/phase3/RELEASE-NOTES
@@ -5,16 +5,21 @@
66
77 == MediaWiki 1.9.2 ==
88
9 -?? ??, 2007
 9+February 4, 2007
1010
1111 This is a bug-fix update that fixes some installation and other minor
12 -issues with the 1.9.1 release.
 12+issues with the 1.9.1 release as well as a security issue which was
 13+introduced in the 1.9 branch.
1314
 15+JavaScript code which regenerated the "sortable tables" feature did
 16+not properly sanitize input, leading to an HTML injection vulnerability.
 17+
1418 * (bug 8774) Fix path for GNU FDL rights icon on new installs
1519 * (bug 8819) Fix full path disclosure with skins dependencies
1620 * (bug 4268) Fixed data-loss bug in compressOld batch text compression
1721 affecting pages which had null edits (move, protect, etc) as second
1822 edit in a batch group. Isolated and patched by Travis Derouin.
 23+* Security fix for sortable tables JavaScript
1924
2025
2126 == MediaWiki 1.9.1 ==