Merge "Remove "activeusers-updated" cache key usage"

[lhc/web/wiklou.git] / includes / media / XMPInfo.php

diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 2a31001..6fc2343 100644 (file)
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -34,8 +34,6 @@ class XMPInfo {
                return self::$items;
        }
 
-       static private $ranHooks = false;
-
        /**
         * XMPInfo::$items keeps a list of all the items
         * we are interested to extract, as well as
@@ -50,7 +48,7 @@ class XMPInfo {
         *   * mode - What type of item (self::MODE_SIMPLE usually, see above for
         *     all values).
         *   * validate - Method to validate input. Could also post-process the
-        *     input. A string value is assumed to be a static method of
+        *     input. A string value is assumed to be a method of
         *     XMPValidate. Can also take a array( 'className', 'methodName' ).
         *   * choices - Array of potential values (format of 'value' => true ).
         *     Only used with validateClosed.
@@ -707,7 +705,7 @@ class XMPInfo {
                        ),
                        'creator' => array(
                                'map_group' => 'general',
-                               'map_name' => 'Artist', //map with exif Artist, iptc byline (2:80)
+                               'map_name' => 'Artist', // map with exif Artist, iptc byline (2:80)
                                'mode' => XMPReader::MODE_SEQ,
                        ),
                        'date' => array(
@@ -874,7 +872,7 @@ class XMPInfo {
                                'mode' => XMPReader::MODE_SIMPLE,
                        ),
                ),
-               //Note, this property affects how jpeg metadata is extracted.
+               // Note, this property affects how jpeg metadata is extracted.
                'http://ns.adobe.com/xmp/note/' => array(
                        'HasExtendedXMP' => array(
                                'map_group' => 'special',