Merge "Deprecate ORMTable::getFieldPrefix"

diff --combined includes/db/ORMTable.php
index 2f898b7,9f3f8d2..755a851
--- 1/includes/db/ORMTable.php
--- 2/includes/db/ORMTable.php
+++ b/includes/db/ORMTable.php
@@@ -129,6 -129,7 +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
         */
@@@ -748,7 -749,7 +749,7 @@@
         *
         * @since 1.20
         *
 -       * @param array|string $fields
 +       * @param array $fields
         *
         * @return array
         */
@@@ -770,7 -771,7 +771,7 @@@
         * @return string
         */
        public function getPrefixedField( $field ) {
-               return $this->getFieldPrefix() . $field;
+               return $this->fieldPrefix . $field;
        }
  
        /**
@@@ -796,7 -797,7 +797,7 @@@
         * @return string
         */
        public function unprefixFieldName( $fieldName ) {
-               return substr( $fieldName, strlen( $this->getFieldPrefix() ) );
+               return substr( $fieldName, strlen( $this->fieldPrefix ) );
        }
  
        /**