(bug 4875) Define a div containing the shared image description

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 78a0433..c8add10 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -597,7 +597,7 @@ fully support the editing toolbar, but was found to be too confusing.
   showing a bogus current timestamp
 * Reset $wgActionPaths during parser test; corrects some false failures
   in the automated test report.
-
+* (bug 4875) Define a div containing the shared image description
 
 === Caveats ===
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 9d06e38..24b0e48 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -60,11 +60,13 @@ class ImagePage extends Article {
                                $this->viewUpdates();
                        }
 
-                       if ($this->mExtraDescription) {
-                               $fol = wfMsg('shareddescriptionfollows');
-                               if ($fol != '-')
-                                       $wgOut->addWikiText(wfMsg('shareddescriptionfollows'));
-                               $wgOut->addHTML($this->mExtraDescription);
+                       # Show shared description, if needed
+                       if( $this->mExtraDescription ) {
+                               $fol = wfMsg( 'shareddescriptionfollows' );
+                               if( $fol != '-' ) {
+                                       $wgOut->addWikiText( $fol );
+                               }
+                               $wgOut->addHTML( '<div id="shared-image-desc">' . $this->mExtraDescription . '</div>' );
                        }
 
                        $this->closeShowImage();