diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-11 18:28:45 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:08:14 +0100 |
| commit | a7ae2e874a28aed2c190840634db50a19ab1d2e7 (patch) | |
| tree | 1e86370be647a8845bf2ac11c0287def1f3802db /lib/private/db | |
| parent | b5bc37d2e40aba0ab8d3e72e7f7075352839096d (diff) | |
| download | nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.tar.gz nextcloud-server-a7ae2e874a28aed2c190840634db50a19ab1d2e7.zip | |
Squash 'a | b' into 'a|b', in /lib
Diffstat (limited to 'lib/private/db')
| -rw-r--r-- | lib/private/db/mdb2schemareader.php | 2 | ||||
| -rw-r--r-- | lib/private/db/statementwrapper.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index 1c16d03eab2..0923b6cf1a9 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -303,7 +303,7 @@ class MDB2SchemaReader { } /** - * @param \SimpleXMLElement | string $xml + * @param \SimpleXMLElement|string $xml * @return bool */ private function asBool($xml) { diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php index 492209b883b..70d1f985a41 100644 --- a/lib/private/db/statementwrapper.php +++ b/lib/private/db/statementwrapper.php @@ -41,7 +41,7 @@ class OC_DB_StatementWrapper { * make execute return the result instead of a bool * * @param array $input - * @return \OC_DB_StatementWrapper | int + * @return \OC_DB_StatementWrapper|int */ public function execute($input=array()) { if(OC_Config::getValue( "log_query", false)) { |