Merge "fix some spacing"

diff --cc includes/GlobalFunctions.php
Simple merge

diff --cc includes/MimeMagic.php
Simple merge

diff --cc includes/User.php
Simple merge

diff --cc includes/WikiPage.php
Simple merge

diff --cc includes/Xml.php
Simple merge

diff --cc includes/db/Database.php
Simple merge

diff --cc includes/media/BitmapMetadataHandler.php
Simple merge

diff --cc includes/media/Exif.php
Simple merge

diff --cc includes/media/FormatMetadata.php
Simple merge

diff --cc includes/media/IPTC.php
Simple merge

diff --cc includes/media/MediaHandler.php
Simple merge

diff --cc includes/media/XMP.php
index 0f341ae,dc1e7bd..5fd4cb0
--- 1/includes/media/XMP.php
--- 2/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' ) ) {

diff --cc includes/media/XMPValidate.php
Simple merge