Merge branch '2.7' into 2.8

This commit is contained in:
mark_story 2015-10-15 22:10:56 -04:00
commit 707915e693
17 changed files with 157 additions and 124 deletions

View file

@ -739,9 +739,9 @@ class DboSource extends DataSource {
/**
* Returns a single field of the first of query results for a given SQL query, or false if empty.
*
* @param string $name Name of the field
* @param string $sql SQL query
* @return mixed Value of field read.
* @param string $name The name of the field to get.
* @param string $sql The SQL query.
* @return mixed Value of field read, or false if not found.
*/
public function field($name, $sql) {
$data = $this->fetchRow($sql);
@ -3209,7 +3209,7 @@ class DboSource extends DataSource {
*
* @param string $table The name of the table to update.
* @param string $column The column to use when resetting the sequence value.
* @return bool|void success.
* @return bool Success.
*/
public function resetSequence($table, $column) {
}