← Back to branch summary

~ubuntu-branches/ubuntu/maverick/mediawiki/maverick

« back to all changes in this revision

Viewing changes to includes/api/ApiQueryRevisions.php

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Wiltshire, Thorsten Glaser, Jonathan Wiltshire
  • Date: 2010-07-28 12:23:04 UTC
  • mfrom: (16.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100728122304-l7cklondi123hl7v
Tags: 1:1.15.5-1
http://bugs.debian.org/590660
https://launchpad.net/bugs/610782
http://bugs.debian.org/590669
https://launchpad.net/bugs/610819
[ Thorsten Glaser ]
* debian/patches/suppress_warnings.patch: new, suppress warnings
  about session_start() being called twice also in the PHP error
  log, not just MediaWiki’s, for example run from FusionForge

[ Jonathan Wiltshire ]
* New upstream security release:
  - correctly set caching headers to prevent private data leakage
       (closes: #590660, LP: #610782)
  - fix XSS vulnerability in profileinfo.php
       (closes: #590669, LP: #610819)

Show diffs side-by-side

added added

removed removed

Lines of Context:
includes/api/ApiQueryRevisions.php
411
411
                return $vals;
412
412
        }
413
413
 
 
414
        public function getCacheMode( $params ) {
 
415
                if ( isset( $params['token'] ) ) {
 
416
                        return 'private';
 
417
                }
 
418
                if ( !is_null( $params['prop'] ) && in_array( 'parsedcomment', $params['prop'] ) ) {
 
419
                        // formatComment() calls wfMsg() among other things
 
420
                        return 'anon-public-user-private';
 
421
                }               
 
422
                return 'public';
 
423
        }
 
424
 
414
425
        public function getAllowedParams() {
415
426
                return array (
416
427
                        'prop' => array (
519
530
        }
520
531
 
521
532
        public function getVersion() {
522
 
                return __CLASS__ . ': $Id: ApiQueryRevisions.php 48642 2009-03-20 20:21:38Z midom $';
 
533
                return __CLASS__ . ': $Id: ApiQueryRevisions.php 69986 2010-07-27 03:57:39Z tstarling $';
523
534
        }
524
535
}