fixes from live site
authorRiver Tarnell <kateturner@users.mediawiki.org>
Sun, 3 Jul 2005 05:01:21 +0000 (05:01 +0000)
committerRiver Tarnell <kateturner@users.mediawiki.org>
Sun, 3 Jul 2005 05:01:21 +0000 (05:01 +0000)
includes/ImagePage.php

index 549b121..a982b44 100644 (file)
@@ -142,12 +142,6 @@ class ImagePage extends Article {
                $sk = $wgUser->getSkin();
 
                if ( $this->img->exists() ) {
-                       if($this->img->fromSharedDirectory
-                          && $wgRepositoryBaseUrl && $wgFetchCommonsDescriptions) {
-                               $this->printSharedImageText();
-                               return;
-                       }
-
                        # image
                        $width = $this->img->getWidth();
                        $height = $this->img->getHeight();
@@ -257,7 +251,7 @@ class ImagePage extends Article {
 
                if ($wgRepositoryBaseUrl && $wgFetchCommonsDescriptions) {
                        $ur = ini_set('allow_url_fopen', true);
-                       $text = @file_get_contents($url);
+                       $text = @file_get_contents($url . '?action=render');
                        ini_set('allow_url_fopen', $ur);
                        if ($text)
                                $wgOut->addHTML($text);