← Back to branch summary

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

« back to all changes in this revision

Viewing changes to includes/Block.php

  • Committer: Bazaar Package Importer
  • Author(s): Romain Beauxis
  • Date: 2009-06-19 01:38:50 UTC
  • mfrom: (16.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090619013850-dsn4lrxvs90ab4rx
Tags: 1:1.15.0-1
http://bugs.debian.org/530328
http://bugs.debian.org/501569
http://bugs.debian.org/520121
* New upstream release. 
* Upstream added support for OASIS documents.
Closes: #530328
* Refreshed quilt patches
* Bumped standards versions to 3.8.2
* Bumped compat to 7
* Pointed to GPL-2 in debian/copyright
* Added php5-sqlite to possible DB backend dependencies.
Closes: #501569
* Proofread README.Debian, upgrade is documented there.
Closes: #520121

Show diffs side-by-side

added added

removed removed

Lines of Context:
includes/Block.php
105
105
                        && $this->mHideName == $block->mHideName
106
106
                        && $this->mBlockEmail == $block->mBlockEmail
107
107
                        && $this->mAllowUsertalk == $block->mAllowUsertalk
 
108
                        && $this->mReason == $block->mReason
108
109
                );
109
110
        }
110
111
 
570
571
                
571
572
                ## Allow hooks to cancel the autoblock.
572
573
                if (!wfRunHooks( 'AbortAutoblock', array( $autoblockIP, &$this ) )) {
573
 
                        wfDebug( "Autoblock aborted by hook." );
 
574
                        wfDebug( "Autoblock aborted by hook.\n" );
574
575
                        return false;
575
576
                }
576
577