From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 7 Mar 2013 17:13:27 +0000 (+0000)
Subject: Merge "fix some spacing"
X-Git-Tag: 1.31.0-rc.0~20438
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=073a675adfc984835fd0cab406b9ca9f5d45355c;p=lhc%2Fweb%2Fwiklou.git

Merge "fix some spacing"
---

073a675adfc984835fd0cab406b9ca9f5d45355c
diff --cc includes/media/XMP.php
index 0f341ae79b,dc1e7bd6c0..5fd4cb0171
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@@ -63,19 -63,19 +63,19 @@@ class XMPReader 
  	protected $items;
  
  	/**
 -	* These are various mode constants.
 -	* they are used to figure out what to do
 -	* with an element when its encountered.
 -	*
 -	* For example, MODE_IGNORE is used when processing
 -	* a property we're not interested in. So if a new
 -	* element pops up when we're in that mode, we ignore it.
 -	*/
 +	 * These are various mode constants.
 +	 * they are used to figure out what to do
 +	 * with an element when its encountered.
 +	 *
 +	 * For example, MODE_IGNORE is used when processing
 +	 * a property we're not interested in. So if a new
 +	 * element pops up when we're in that mode, we ignore it.
 +	 */
  	const MODE_INITIAL = 0;
- 	const MODE_IGNORE  = 1;
- 	const MODE_LI      = 2;
+ 	const MODE_IGNORE = 1;
+ 	const MODE_LI = 2;
  	const MODE_LI_LANG = 3;
- 	const MODE_QDESC   = 4;
+ 	const MODE_QDESC = 4;
  
  	// The following MODE constants are also used in the
  	// $items array to denote what type of property the item is.
@@@ -90,12 -90,11 +90,11 @@@
  	const NS_RDF = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#';
  	const NS_XML = 'http://www.w3.org/XML/1998/namespace';
  
- 
  	/**
 -	* Constructor.
 -	*
 -	* Primary job is to initialize the XMLParser
 -	*/
 +	 * Constructor.
 +	 *
 +	 * Primary job is to initialize the XMLParser
 +	 */
  	function __construct() {
  
  		if ( !function_exists( 'xml_parser_create_ns' ) ) {