From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 5 Feb 2006 18:32:55 +0000 (+0000)
Subject: (bug 4875) Define a div containing the shared image description
X-Git-Tag: 1.6.0~375
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=b506512bda20986a36b4d8f60de5a13aff0bf20e;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 78a04338b3..c8add109d7 100644
--- 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 9d06e38a78..24b0e48ca3 100644
--- 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();