X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Fxmp%2FXMP.php;h=90e4543421a7885ff47ca8c82ee0aced53a77455;hb=ee553f8e32a8f1bd8c0232dbbf1127e3592d29b2;hp=d12af7a43ca60dc98bbc0ae7faae9e43c3af4412;hpb=c8d361a38027ef5d808225b8a83f15417248aa67;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/xmp/XMP.php b/includes/libs/xmp/XMP.php
index d12af7a43c..90e4543421 100644
--- a/includes/libs/xmp/XMP.php
+++ b/includes/libs/xmp/XMP.php
@@ -491,7 +491,7 @@ class XMPReader implements LoggerAwareInterface {
 	 * <exif:DigitalZoomRatio>0/10</exif:DigitalZoomRatio>
 	 * and are processing the 0/10 bit.
 	 *
-	 * @param XMLParser $parser XMLParser reference to the xml parser
+	 * @param resource $parser XMLParser reference to the xml parser
 	 * @param string $data Character data
 	 * @throws RuntimeException On invalid data
 	 */
@@ -776,7 +776,7 @@ class XMPReader implements LoggerAwareInterface {
 	 * Ignores the outer wrapping elements that are optional in
 	 * xmp and have no meaning.
 	 *
-	 * @param XMLParser $parser
+	 * @param resource $parser
 	 * @param string $elm Namespace . ' ' . element name
 	 * @throws RuntimeException
 	 */
@@ -895,7 +895,7 @@ class XMPReader implements LoggerAwareInterface {
 		if ( $elm === self::NS_RDF . ' Seq' ) {
 			array_unshift( $this->mode, self::MODE_LI );
 		} elseif ( $elm === self::NS_RDF . ' Bag' ) {
-			# bug 27105
+			# T29105
 			$this->logger->info( __METHOD__ . ' Expected an rdf:Seq, but got an rdf:Bag. Pretending'
 				. ' it is a Seq, since some buggy software is known to screw this up.' );
 			array_unshift( $this->mode, self::MODE_LI );
@@ -1086,7 +1086,7 @@ class XMPReader implements LoggerAwareInterface {
 				}
 			} else {
 				array_unshift( $this->mode, self::MODE_IGNORE );
-				array_unshift( $this->curItem, $elm );
+				array_unshift( $this->curItem, $ns . ' ' . $tag );
 
 				return;
 			}
@@ -1188,7 +1188,7 @@ class XMPReader implements LoggerAwareInterface {
 	 * Generally just calls a helper based on what MODE we're in.
 	 * Also does some initial set up for the wrapper element
 	 *
-	 * @param XMLParser $parser
+	 * @param resource $parser
 	 * @param string $elm Namespace "<space>" element
 	 * @param array $attribs Attribute name => value
 	 * @throws RuntimeException