diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
commit | 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch) | |
tree | af68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /includes/media/XMP.php | |
parent | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff) |
Update to MediaWiki 1.22.0
Diffstat (limited to 'includes/media/XMP.php')
-rw-r--r-- | includes/media/XMP.php | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/includes/media/XMP.php b/includes/media/XMP.php index 62738a00..7eb3d19e 100644 --- a/includes/media/XMP.php +++ b/includes/media/XMP.php @@ -180,12 +180,12 @@ class XMPReader { ) { // the is_array is just paranoia. It should always // be an array. - foreach( $data['xmp-special']['LocationShown'] as $loc ) { + foreach ( $data['xmp-special']['LocationShown'] as $loc ) { if ( !is_array( $loc ) ) { // To avoid copying over the _type meta-fields. continue; } - foreach( $loc as $field => $val ) { + foreach ( $loc as $field => $val ) { $data['xmp-general'][$field . 'Dest'][] = $val; } } @@ -195,12 +195,12 @@ class XMPReader { ) { // the is_array is just paranoia. It should always // be an array. - foreach( $data['xmp-special']['LocationCreated'] as $loc ) { + foreach ( $data['xmp-special']['LocationCreated'] as $loc ) { if ( !is_array( $loc ) ) { // To avoid copying over the _type meta-fields. continue; } - foreach( $loc as $field => $val ) { + foreach ( $loc as $field => $val ) { $data['xmp-general'][$field . 'Created'][] = $val; } } @@ -391,7 +391,9 @@ class XMPReader { throw new MWException( 'Unexpected character data before first rdf:Description element' ); } - if ( $this->mode[0] === self::MODE_IGNORE ) return; + if ( $this->mode[0] === self::MODE_IGNORE ) { + return; + } if ( $this->mode[0] !== self::MODE_SIMPLE && $this->mode[0] !== self::MODE_QDESC @@ -414,7 +416,7 @@ class XMPReader { * * @param string $elm Namespace of element followed by a space and then tag name of element. */ - private function endElementModeIgnore ( $elm ) { + private function endElementModeIgnore( $elm ) { if ( $this->curItem[0] === $elm ) { array_shift( $this->curItem ); array_shift( $this->mode ); @@ -436,7 +438,7 @@ class XMPReader { * * @param string $elm namespace, space, and tag name. */ - private function endElementModeSimple ( $elm ) { + private function endElementModeSimple( $elm ) { if ( $this->charContent !== false ) { if ( $this->processingArray ) { // if we're processing an array, use the original element @@ -639,7 +641,7 @@ class XMPReader { throw new MWException( "Hit end element </$elm> but no curItem" ); } - switch( $this->mode[0] ) { + switch ( $this->mode[0] ) { case self::MODE_IGNORE: $this->endElementModeIgnore( $elm ); break; @@ -993,15 +995,15 @@ class XMPReader { if ( $elm !== self::NS_RDF . ' li' ) { throw new MWException( __METHOD__ . " <rdf:li> expected but got $elm." ); } - if ( !isset( $attribs[ self::NS_XML . ' lang'] ) - || !preg_match( '/^[-A-Za-z0-9]{2,}$/D', $attribs[ self::NS_XML . ' lang' ] ) ) + if ( !isset( $attribs[self::NS_XML . ' lang'] ) + || !preg_match( '/^[-A-Za-z0-9]{2,}$/D', $attribs[self::NS_XML . ' lang'] ) ) { throw new MWException( __METHOD__ . " <rdf:li> did not contain, or has invalid xml:lang attribute in lang alternative" ); } // Lang is case-insensitive. - $this->itemLang = strtolower( $attribs[ self::NS_XML . ' lang' ] ); + $this->itemLang = strtolower( $attribs[self::NS_XML . ' lang'] ); // need to add curItem[0] on again since one is for the specific item // and one is for the entire group. @@ -1058,7 +1060,7 @@ class XMPReader { . "encountered <$elm> with no mode" ); } - switch( $this->mode[0] ) { + switch ( $this->mode[0] ) { case self::MODE_IGNORE: $this->startElementModeIgnore( $elm ); break; |