Revision: 48578
Author: demon
Date: 2009-03-19 12:34:14 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
No more Image::newFromName/newFromTitle. wfFindFile() takes strings or titles.
Modified Paths:
--------------
trunk/extensions/Click/Click.php
trunk/extensions/FileSearch/FileSearchIndexer.php
trunk/extensions/Gnuplot/Gnuplot.php
trunk/extensions/Icon/Icon.php
trunk/extensions/ImageMap/ImageMap_body.php
trunk/extensions/ImageTagging/ImageTagging.php
trunk/extensions/ImageTagging/ImageTagging_body.php
trunk/extensions/Logo/Logo.php
trunk/extensions/MiniPreview/MiniPreview.php
trunk/extensions/News/NewsRenderer.php
trunk/extensions/Player/PlayerClass.php
trunk/extensions/ProofreadPage/ProofreadPage.php
trunk/extensions/RDF/Rdf.php
trunk/extensions/RdfRedland/Modelers/Image.php
trunk/extensions/SmoothGallery/SmoothGalleryParser.php
trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
trunk/extensions/TreeAndMenu/TreeAndMenu.php
Modified: trunk/extensions/Click/Click.php
===================================================================
--- trunk/extensions/Click/Click.php 2009-03-19 11:52:05 UTC (rev 48577)
+++ trunk/extensions/Click/Click.php 2009-03-19 12:34:14 UTC (rev 48578)
@@ -101,7 +101,7 @@
// Add image element, or use alt text on it's own if image doesn't
exist.
$imagetitle = Title::newFromText( $image );
- if( is_object( $imagetitle ) ) $imageimage = Image::newFromTitle(
$imagetitle );
+ if( is_object( $imagetitle ) ) $imageimage = wfFindFile( $imagetitle );
if( isset( $imageimage ) && is_object( $imagetitle ) && is_object(
$imageimage ) && $imageimage->exists() ) {
// Display image.
if( !$width ) $width = $imageimage->getWidth();
Modified: trunk/extensions/FileSearch/FileSearchIndexer.php
===================================================================
--- trunk/extensions/FileSearch/FileSearchIndexer.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/FileSearch/FileSearchIndexer.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -47,7 +47,7 @@
if( $namespace == NS_IMAGE ) {
wfDebugLog( 'filesearch', "Update called for
`{$title}`" );
$titleObj = Title::makeTitle( NS_IMAGE, $title );
- $image = Image::newFromTitle( $titleObj );
+ $image = wfFindFile( $titleObj );
if ( !$image->exists() ) {
wfDebugLog( 'filesearch', "Image does not
exist: $title" );
return;
Modified: trunk/extensions/Gnuplot/Gnuplot.php
===================================================================
--- trunk/extensions/Gnuplot/Gnuplot.php 2009-03-19 11:52:05 UTC (rev
48577)
+++ trunk/extensions/Gnuplot/Gnuplot.php 2009-03-19 12:34:14 UTC (rev
48578)
@@ -147,6 +147,6 @@
* Output : the filesystem path for the file
*/
function getSourceDataPath ( $name ) {
- $h = Image::newFromName($name);
+ $h = wfFindFile($name);
return $h->exists() ? $h->getImagePath() : null;
}
Modified: trunk/extensions/Icon/Icon.php
===================================================================
--- trunk/extensions/Icon/Icon.php 2009-03-19 11:52:05 UTC (rev 48577)
+++ trunk/extensions/Icon/Icon.php 2009-03-19 12:34:14 UTC (rev 48578)
@@ -57,7 +57,7 @@
// check if we are dealing with an InterWiki link
if ( $ititle->isLocal() ) {
- $image = Image::newFromName( $img );
+ $image = wfFindFile( $img );
if (!$image->exists())
return '[[Image:'.$img.']]';
Modified: trunk/extensions/ImageMap/ImageMap_body.php
===================================================================
--- trunk/extensions/ImageMap/ImageMap_body.php 2009-03-19 11:52:05 UTC (rev
48577)
+++ trunk/extensions/ImageMap/ImageMap_body.php 2009-03-19 12:34:14 UTC (rev
48578)
@@ -98,7 +98,7 @@
$imageObj = wfFindFile( $imageTitle );
} else {
// Old MW
- $imageObj = Image::newFromTitle(
$imageTitle );
+ $imageObj = wfFindFile( $imageTitle );
}
if ( !$imageObj || !$imageObj->exists() ) {
return self::error(
'imagemap_invalid_image' );
Modified: trunk/extensions/ImageTagging/ImageTagging.php
===================================================================
--- trunk/extensions/ImageTagging/ImageTagging.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/ImageTagging/ImageTagging.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -94,7 +94,7 @@
$tagName = preg_replace( "/[\"'<>]/", "", $tagName );
$imgName = preg_replace( "/[\"'<>]/", "", $imgName );
- $img = Image::newFromName($imgName);
+ $img = wfFindFile($imgName);
if ($img) {
$imgTitle = $img->getTitle();
@@ -150,7 +150,7 @@
$tagName = preg_replace( "/[\"'<>]/", "", $tagName );
$imgName = preg_replace( "/[\"'<>]/", "", $imgName );
- $img = Image::newFromName($imgName);
+ $img = wfFindFile($imgName);
if ($img) {
$imgTitle = $img->getTitle();
Modified: trunk/extensions/ImageTagging/ImageTagging_body.php
===================================================================
--- trunk/extensions/ImageTagging/ImageTagging_body.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/ImageTagging/ImageTagging_body.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -60,7 +60,7 @@
$res = $db->query($SQL);
while ($o = $db->fetchObject($res)) {
- $img = Image::newFromName($o->img_name);
+ $img = wfFindFile($o->img_name);
$this->add($img, '');
}
$db->freeResult($res);
@@ -236,4 +236,4 @@
$s .= $this->pagerHTML('bottom');
return $s;
}
-} //class
\ No newline at end of file
+} //class
Modified: trunk/extensions/Logo/Logo.php
===================================================================
--- trunk/extensions/Logo/Logo.php 2009-03-19 11:52:05 UTC (rev 48577)
+++ trunk/extensions/Logo/Logo.php 2009-03-19 12:34:14 UTC (rev 48578)
@@ -20,7 +20,7 @@
if( is_object( $title ) ) {
if( $title->getNamespace() != NS_IMAGE )
$title = Title::makeTitle( NS_IMAGE,
$title->getText() );
- $logo = Image::newFromTitle( $title );
+ $logo = wfFindFile( $title );
if( $logo->exists() )
$wgLogo = $logo->createThumb( 135 );
}
Modified: trunk/extensions/MiniPreview/MiniPreview.php
===================================================================
--- trunk/extensions/MiniPreview/MiniPreview.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/MiniPreview/MiniPreview.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -388,7 +388,7 @@
function wfMiniPreviewGetImageData ( $image_titles , &$image_data ) {
$image_data = array(); # Paranoia
foreach ( $image_titles AS $i ) {
- $image_data[$i] = Image::newFromName( $i );
+ $image_data[$i] = wfFindFile( $i );
$image_data[$i]->load();
}
}
Modified: trunk/extensions/News/NewsRenderer.php
===================================================================
--- trunk/extensions/News/NewsRenderer.php 2009-03-19 11:52:05 UTC (rev
48577)
+++ trunk/extensions/News/NewsRenderer.php 2009-03-19 12:34:14 UTC (rev
48578)
@@ -633,7 +633,7 @@
$ticon = $icon ? Title::newFromText($icon, NS_IMAGE) : NULL;
if ( $ticon ) {
- $image = Image::newFromTitle( $ticon );
+ $image = wfFindFile( $ticon );
if ( !$image->exists() ) {
$image = false;
}
Modified: trunk/extensions/Player/PlayerClass.php
===================================================================
--- trunk/extensions/Player/PlayerClass.php 2009-03-19 11:52:05 UTC (rev
48577)
+++ trunk/extensions/Player/PlayerClass.php 2009-03-19 12:34:14 UTC (rev
48578)
@@ -49,7 +49,7 @@
static function newFromTitle( $title, $options, $sizeDefault =
'imagesize' ) {
wfLoadExtensionMessages( 'Player' );
- $image = Image::newFromTitle( $title );
+ $image = wfFindFile( $title );
if ( !$image->exists() ) {
throw new PlayerException(wfMsg("player-not-found"),
404);
}
@@ -379,7 +379,7 @@
$thumbstyle = '';
$thumbimg = NULL;
$thumbname = @$attributes['thumb'];
- if ($thumbname) $thumbimg = Image::newFromName( $thumbname );
+ if ($thumbname) $thumbimg = wfFindFile( $thumbname );
if ($thumbimg && $thumbimg->exists()) {
$tni = $thumbimg->getThumbnail( $this->width,
$this->height );
Modified: trunk/extensions/ProofreadPage/ProofreadPage.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/ProofreadPage/ProofreadPage.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -83,7 +83,7 @@
}
if ( !$imageTitle ) return;
- $image = Image::newFromTitle( $imageTitle );
+ $image = wfFindFile( $imageTitle );
//if it is multipage, we use the page order of the file
if( $image->exists() && $image->isMultiPage() ) {
@@ -298,7 +298,7 @@
return true;
}
- $image = Image::newFromTitle( $imageTitle );
+ $image = wfFindFile( $imageTitle );
if ( $image->exists() ) {
$width = $image->getWidth();
$height = $image->getHeight();
@@ -540,7 +540,7 @@
if ( !$imageTitle ) {
return true;
}
- $image = Image::newFromTitle( $imageTitle );
+ $image = wfFindFile( $imageTitle );
$return="";
if ( $image->isMultipage() ) {
Modified: trunk/extensions/RDF/Rdf.php
===================================================================
--- trunk/extensions/RDF/Rdf.php 2009-03-19 11:52:05 UTC (rev 48577)
+++ trunk/extensions/RDF/Rdf.php 2009-03-19 12:34:14 UTC (rev 48578)
@@ -644,7 +644,7 @@
'MwRdfImage');
while ($res && $row = $dbr->fetchObject($res)) {
- $img = Image::newFromName($row->il_to);
+ $img = wfFindFile($row->il_to);
if ($img->exists()) {
$iuri = $img->getURL();
if ($iuri[0] == '/') {
Modified: trunk/extensions/RdfRedland/Modelers/Image.php
===================================================================
--- trunk/extensions/RdfRedland/Modelers/Image.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/RdfRedland/Modelers/Image.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -43,7 +43,7 @@
array('il_from = ' . $this->Agent->getTitle()->getArticleID()),
'MwRdfImage');
while ($res && $row = $dbr->fetchObject($res)) {
- $img = Image::newFromName($row->il_to);
+ $img = wfFindFile($row->il_to);
if ( ! $img->exists() ) continue;
$iuri = $img->getURL();
if ($iuri[0] == '/') $iuri = $wgServer . $iuri;
Modified: trunk/extensions/SmoothGallery/SmoothGalleryParser.php
===================================================================
--- trunk/extensions/SmoothGallery/SmoothGalleryParser.php 2009-03-19
11:52:05 UTC (rev 48577)
+++ trunk/extensions/SmoothGallery/SmoothGalleryParser.php 2009-03-19
12:34:14 UTC (rev 48578)
@@ -203,7 +203,7 @@
$imageArray = Array();
//Get the image object from the database
- $img_obj = Image::newFromTitle( $title );
+ $img_obj = wfFindFile( $title );
if ( !$img_obj->exists() ) {
//The user asked for an image that doesn't exist, let's
Modified: trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
===================================================================
--- trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
2009-03-19 11:52:05 UTC (rev 48577)
+++ trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php
2009-03-19 12:34:14 UTC (rev 48578)
@@ -977,7 +977,7 @@
if( $fanbox['fantag_image_name'] ){
$fantag_image_width = 45;
$fantag_image_height = 53;
- $fantag_image =
Image::newFromName( $fanbox['fantag_image_name'] );
+ $fantag_image = wfFindFile(
$fanbox['fantag_image_name'] );
$fantag_image_url =
$fantag_image->createThumb($fantag_image_width, $fantag_image_height);
$fantag_image_tag = '<img
alt="" src="' . $fantag_image_url . '"/>';
};
Modified: trunk/extensions/TreeAndMenu/TreeAndMenu.php
===================================================================
--- trunk/extensions/TreeAndMenu/TreeAndMenu.php 2009-03-19 11:52:05 UTC
(rev 48577)
+++ trunk/extensions/TreeAndMenu/TreeAndMenu.php 2009-03-19 12:34:14 UTC
(rev 48578)
@@ -70,7 +70,7 @@
# Convert image titles to file paths and store as JS to update
dTree
foreach ($wgTreeViewImages as $k => $v) {
$title = Title::newFromText($v,NS_IMAGE);
- $image = Image::newFromTitle($title);
+ $image = wfFindFile($title);
$v = $image && $image->exists() ? $image->getURL() :
$wgTreeViewImages[$k];
$this->images .= "tree.icon['$k'] = '$v';";
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
