Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't call wfFindFile twice when it's not necessary.

Browse source
This commit is contained in:
Bryan Tong Minh 2008-05-10 14:19:25 +00:00
parent 3cd13678c7
commit bbfcb113c3
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/ImagePage.php
View file

@ -134,6 +134,10 @@ class ImagePage extends Article {
public function isLocal() {
return $this->img->isLocal();
}
public function getFile() {
return $this->img;
}
/**
* Create the TOC

9
includes/Wiki.php
View file

@ -278,12 +278,13 @@ class MediaWiki {
// Namespace might change when using redirects
// Check for redirects ...
$file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null;
if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content
&& !$request->getVal( 'oldid' ) && // ... and are not old revisions
$request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to
// ... and the article is not an image page with associated file
!( $title->getNamespace() == NS_IMAGE && wfFindFile( $title->getText(), false,
FileRepo::FIND_IGNORE_REDIRECT ) ) ) { // ... unless it is really an image redirect
!( is_object( $file ) && $file->exists() &&
!$file->getRedirected() ) ) { // ... unless it is really an image redirect
$dbr = wfGetDB( DB_SLAVE );
$article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
@ -303,8 +304,8 @@ class MediaWiki {
$rarticle = self::articleFromTitle( $target );
$rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
if ( $rarticle->getTitle()->exists() ||
( $title->getNamespace() == NS_IMAGE &&
!$article->isLocal() ) ) {
( is_object( $file ) &&
!$file->isLocal() ) ) {
$rarticle->setRedirectedFrom( $title );
$article = $rarticle;
$title = $target;