Merge "Drop zh-tw message "saveprefs""

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

diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 7e47ec1..1d8d777 100644 (file)
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -31,18 +31,9 @@ class XMPInfo {
         * @return array XMP item configuration array.
         */
        public static function getItems() {
-               if ( !self::$ranHooks ) {
-                       // This is for if someone makes a custom metadata extension.
-                       // For example, a medical wiki might want to decode DICOM xmp properties.
-                       wfRunHooks( 'XMPGetInfo', array( &self::$items ) );
-                       self::$ranHooks = true; // Only want to do this once.
-               }
-
                return self::$items;
        }
 
-       static private $ranHooks = false;
-
        /**
         * XMPInfo::$items keeps a list of all the items
         * we are interested to extract, as well as
@@ -57,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.