| Index: trunk/phase3/includes/CategoryPage.php |
| — | — | @@ -124,11 +124,13 @@ |
| 125 | 125 | array_push( $children_start_char, $wgContLang->convert( $sortkey ) ) ; |
| 126 | 126 | } elseif( $showGallery && $title->getNamespace() == NS_IMAGE ) { |
| 127 | 127 | // Show thumbnails of categorized images, in a separate chunk |
| | 128 | + $anImage = new Image($title); |
| 128 | 129 | if( $flip ) { |
| 129 | | - $ig->insert( Image::newFromTitle( $title ) ); |
| | 130 | + $ig->insert( $anImage ); |
| 130 | 131 | } else { |
| 131 | | - $ig->add( Image::newFromTitle( $title ) ); |
| | 132 | + $ig->add( $anImage ); |
| 132 | 133 | } |
| | 134 | + unset($anImage); |
| 133 | 135 | } else { |
| 134 | 136 | // Page in this category |
| 135 | 137 | array_push( $articles, $sk->makeSizeLinkObj( $x->page_len, $title, $wgContLang->convert( $title->getPrefixedText() ) ) ) ; |
| Index: trunk/phase3/includes/ExternalEdit.php |
| — | — | @@ -48,7 +48,7 @@ |
| 49 | 49 | $extension="wiki"; |
| 50 | 50 | } elseif($this->mMode=="file") { |
| 51 | 51 | $type="Edit file"; |
| 52 | | - $image = Image::newFromTitle( $this->mTitle ); |
| | 52 | + $image = new Image( $this->mTitle ); |
| 53 | 53 | $img_url = $image->getURL(); |
| 54 | 54 | if(strpos($img_url,"://")) { |
| 55 | 55 | $url = $img_url; |
| Index: trunk/phase3/includes/Parser.php |
| — | — | @@ -1634,7 +1634,7 @@ |
| 1635 | 1635 | $s .= $this->makeKnownLinkHolder( $nt, $text, '', $trail, $prefix ); |
| 1636 | 1636 | continue; |
| 1637 | 1637 | } elseif( $ns == NS_IMAGE ) { |
| 1638 | | - $img = Image::newFromTitle( $nt ); |
| | 1638 | + $img = new Image( $nt ); |
| 1639 | 1639 | if( $img->exists() ) { |
| 1640 | 1640 | // Force a blue link if the file exists; may be a remote |
| 1641 | 1641 | // upload on the shared repository, and we want to see its |
| Index: trunk/phase3/includes/SpecialNewimages.php |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | $ut = $s->img_user_text; |
| 132 | 132 | |
| 133 | 133 | $nt = Title::newFromText( $name, NS_IMAGE ); |
| 134 | | - $img = Image::newFromTitle( $nt ); |
| | 134 | + $img = new Image( $nt ); |
| 135 | 135 | $ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut ); |
| 136 | 136 | |
| 137 | 137 | $gallery->add( $img, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" ); |
| Index: trunk/phase3/includes/Image.php |
| — | — | @@ -66,14 +66,6 @@ |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | | - /** |
| 71 | | - * Obsolete factory function, use constructor |
| 72 | | - * @deprecated |
| 73 | | - */ |
| 74 | | - function newFromTitle( $title ) { |
| 75 | | - return new Image( $title ); |
| 76 | | - } |
| 77 | | - |
| 78 | 70 | function Image( $title ) { |
| 79 | 71 | if( !is_object( $title ) ) { |
| 80 | 72 | throw new MWException( 'Image constructor given bogus title.' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -47,6 +47,7 @@ |
| 48 | 48 | cache object. |
| 49 | 49 | * (bug 6299) Maintain parser's revision ID across recursive calls to fix |
| 50 | 50 | {{REVISIONID}} when Cite extension is used |
| | 51 | +* (bug 6622) Removed deprecated function image::newFromTitle |
| 51 | 52 | |
| 52 | 53 | |
| 53 | 54 | == Languages updated == |