Index: trunk/phase3/includes/db/Database.php |
— | — | @@ -861,8 +861,7 @@ |
862 | 862 | * (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
863 | 863 | * @return mixed Database result resource (feed to DatabaseBase::fetchObject or whatever), or false on failure |
864 | 864 | */ |
865 | | - function select( $table, $vars, $conds='', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) |
866 | | - { |
| 865 | + function select( $table, $vars, $conds='', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) { |
867 | 866 | $sql = $this->selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds ); |
868 | 867 | return $this->query( $sql, $fname ); |
869 | 868 | } |
— | — | @@ -1638,7 +1637,10 @@ |
1639 | 1638 | * However if you do this, you run the risk of encountering errors which wouldn't have |
1640 | 1639 | * occurred in MySQL |
1641 | 1640 | * |
1642 | | - * @todo migrate comment to phodocumentor format |
| 1641 | + * @param $table String: The table to replace the row(s) in. |
| 1642 | + * @param $uniqueIndexes String: |
| 1643 | + * @param $rows Array: Array of rows to replace |
| 1644 | + * @param $fname String: Calling function name (use __METHOD__) for logs/profiling |
1643 | 1645 | */ |
1644 | 1646 | function replace( $table, $uniqueIndexes, $rows, $fname = 'DatabaseBase::replace' ) { |
1645 | 1647 | $table = $this->tableName( $table ); |