r56835 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r56834‎ | r56835 | r56836 >
Date:20:43, 23 September 2009
Author:brion
Status:ok
Tags:
Comment:
Merge r56817 from trunk -- (bug 20780) Fix in UploadBase::detectScript: should check for '<a href', not '<a'. The question remains on whether detectScript is redundant to IEContentAnalyzer.
Reduces false positives in binary files; IE actually checks for '<a href' not '<a' which is much more likely to occur randomly.
Modified paths:
  • /branches/wmf-deployment/includes/upload/UploadBase.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/includes/upload/UploadBase.php
——@@ -700,7 +700,7 @@
701701 * when served with a generic content-type.
702702 */
703703 $tags = array(
704 - '<a',
 704+ '<a href',
705705 '<body',
706706 '<head',
707707 '<html', #also in safari
Property changes on: branches/wmf-deployment/includes/upload/UploadBase.php
___________________________________________________________________
Name: svn:mergeinfo
708708 - /branches/REL1_15/phase3/includes/upload/UploadBase.php:51646
/branches/wmf-deployment/includes/upload/UploadBase.php:53381
/trunk/phase3/includes/upload/UploadBase.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56416,56618,56631
709709 + /branches/REL1_15/phase3/includes/upload/UploadBase.php:51646
/branches/wmf-deployment/includes/upload/UploadBase.php:53381
/trunk/phase3/includes/upload/UploadBase.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,56416,56618,56631,56817

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56817(bug 20780) Fix in UploadBase::detectScript: should check for '<a href', not ...btongminh14:13, 23 September 2009

Status & tagging log