diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/db/IORMTable.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/db/IORMTable.php')
| -rw-r--r-- | includes/db/IORMTable.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/includes/db/IORMTable.php b/includes/db/IORMTable.php index 4dc693ac..b2527f95 100644 --- a/includes/db/IORMTable.php +++ b/includes/db/IORMTable.php @@ -94,7 +94,7 @@ interface IORMTable { public function getSummaryFields(); /** - * Selects the the specified fields of the records matching the provided + * Selects the specified fields of the records matching the provided * conditions and returns them as DBDataObject. Field names get prefixed. * * @see DatabaseBase::select() @@ -113,7 +113,7 @@ interface IORMTable { array $options = array(), $functionName = null ); /** - * Selects the the specified fields of the records matching the provided + * Selects the specified fields of the records matching the provided * conditions and returns them as DBDataObject. Field names get prefixed. * * @since 1.20 @@ -145,7 +145,7 @@ interface IORMTable { array $options = array(), $functionName = null ); /** - * Selects the the specified fields of the records matching the provided + * Selects the specified fields of the records matching the provided * conditions and returns them as associative arrays. * Provided field names get prefixed. * Returned field names will not have a prefix. @@ -170,7 +170,7 @@ interface IORMTable { array $options = array(), $collapse = true, $functionName = null ); /** - * Selects the the specified fields of the first matching record. + * Selects the specified fields of the first matching record. * Field names get prefixed. * * @since 1.20 @@ -186,7 +186,7 @@ interface IORMTable { array $options = array(), $functionName = null ); /** - * Selects the the specified fields of the records matching the provided + * Selects the specified fields of the records matching the provided * conditions. Field names do NOT get prefixed. * * @since 1.20 @@ -202,7 +202,7 @@ interface IORMTable { array $options = array(), $functionName = null ); /** - * Selects the the specified fields of the first record matching the provided + * Selects the specified fields of the first record matching the provided * conditions and returns it as an associative array, or false when nothing matches. * This method makes use of selectFields and expects the same parameters and * returns the same results (if there are any, if there are none, this method returns false). @@ -442,10 +442,11 @@ interface IORMTable { * Takes an array of field names with prefix and returns the unprefixed equivalent. * * @since 1.20 + * @deprecated since 1.25, will be removed * - * @param array $fieldNames + * @param string[] $fieldNames * - * @return array + * @return string[] */ public function unprefixFieldNames( array $fieldNames ); @@ -453,6 +454,7 @@ interface IORMTable { * Takes a field name with prefix and returns the unprefixed equivalent. * * @since 1.20 + * @deprecated since 1.25, will be removed * * @param string $fieldName * |