Merge "Rewrite ORMTable::unprefixFieldNames"

diff --combined includes/db/ORMTable.php
index 755a851,ac27ee2..31f32e5
--- 1/includes/db/ORMTable.php
--- 2/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@@ -129,7 -129,6 +129,7 @@@ class ORMTable extends DBAccessBase imp
         * Gets the db field prefix.
         *
         * @since 1.20
 +       * @deprecated since 1.25, use the $this->fieldPrefix property instead
         *
         * @return string
         */
@@@ -771,7 -770,7 +771,7 @@@
         * @return string
         */
        public function getPrefixedField( $field ) {
 -              return $this->getFieldPrefix() . $field;
 +              return $this->fieldPrefix . $field;
        }
  
        /**
@@@ -784,7 -783,11 +784,11 @@@
         * @return array
         */
        public function unprefixFieldNames( array $fieldNames ) {
-               return array_map( array( $this, 'unprefixFieldName' ), $fieldNames );
+               $start = strlen( $this->fieldPrefix );
+ 
+               return array_map( function( $fieldName ) use ( $start ) {
+                       return substr( $fieldName, $start );
+               }, $fieldNames );
        }
  
        /**
@@@ -797,7 -800,7 +801,7 @@@
         * @return string
         */
        public function unprefixFieldName( $fieldName ) {
 -              return substr( $fieldName, strlen( $this->getFieldPrefix() ) );
 +              return substr( $fieldName, strlen( $this->fieldPrefix ) );
        }
  
        /**