diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-20 13:52:53 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-20 13:52:53 +0100 |
| commit | 31bab5584784f7f157b46be761b4344d25d11031 (patch) | |
| tree | 044b531dac012e4694133f2c269456070c0302b2 /lib/private/db.php | |
| parent | 8cf73ca42fd3e2d362a75e11a0f3ac1ae0ab3a34 (diff) | |
| parent | 742f54b6d556797bbef2847e546861de0008a28a (diff) | |
| download | nextcloud-server-31bab5584784f7f157b46be761b4344d25d11031.tar.gz nextcloud-server-31bab5584784f7f157b46be761b4344d25d11031.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Diffstat (limited to 'lib/private/db.php')
| -rw-r--r-- | lib/private/db.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/db.php b/lib/private/db.php index 23e9593a579..cfdac766bff 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -252,7 +252,7 @@ class OC_DB { * an array with 'sql' and optionally 'limit' and 'offset' keys * .. or a simple sql query string * @param array $parameters - * @return result + * @return OC_DB_StatementWrapper * @throws DatabaseException */ static public function executeAudited( $stmt, array $parameters = null) { @@ -315,6 +315,7 @@ class OC_DB { * @brief Insert a row if a matching row doesn't exists. * @param string $table. The table to insert into in the form '*PREFIX*tableName' * @param array $input. An array of fieldname/value pairs + * @param string $table * @return boolean number of updated rows */ public static function insertIfNotExist($table, $input) { |