mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15736 from owncloud/remove-dependency-on-legacy-code-in-ocp 

Reduce call of legacy wrapper by call the OCP directly
This commit is contained in:
Roeland Douma 2015-04-19 15:42:07 +02:00
parent 3cb5dd68e6 9b8ebdadf7
commit d877c1f1e1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/public/db.php
View File

@ -85,7 +85,7 @@ class DB {
* @since 4.5.0 * @since 4.5.0
*/ */
public static function insertid($table=null) { public static function insertid($table=null) {
return(\OC_DB::insertid($table)); return \OC::$server->getDatabaseConnection()->lastInsertId($table);
} }
/** /**
@ -93,7 +93,7 @@ class DB {
* @since 4.5.0 * @since 4.5.0
*/ */
public static function beginTransaction() { public static function beginTransaction() {
\OC_DB::beginTransaction(); \OC::$server->getDatabaseConnection()->beginTransaction();
} }
/** /**
@ -101,7 +101,7 @@ class DB {
* @since 4.5.0 * @since 4.5.0
*/ */
public static function commit() { public static function commit() {
\OC_DB::commit(); \OC::$server->getDatabaseConnection()->commit();
} }
/** /**
@ -109,7 +109,7 @@ class DB {
* @since 8.0.0 * @since 8.0.0
*/ */
public static function rollback() { public static function rollback() {
\OC_DB::rollback(); \OC::$server->getDatabaseConnection()->rollback();
} }
/** /**
@ -119,7 +119,8 @@ class DB {
* @since 4.5.0 * @since 4.5.0
*/ */
public static function isError($result) { public static function isError($result) {
return(\OC_DB::isError($result)); // Doctrine returns false on error (and throws an exception)
return $result === false;
} }
/** /**
@ -129,7 +130,7 @@ class DB {
* @since 6.0.0 * @since 6.0.0
*/ */
public static function getErrorMessage() { public static function getErrorMessage() {
return(\OC_DB::getErrorMessage()); return \OC::$server->getDatabaseConnection()->getError();
} }
} }

4
lib/public/files.php
View File

@ -94,7 +94,7 @@ class Files {
* @since 5.0.0 * @since 5.0.0
*/ */
public static function tmpFile( $postfix='' ) { public static function tmpFile( $postfix='' ) {
return(\OC_Helper::tmpFile( $postfix )); return \OC::$server->getTempManager()->getTemporaryFile($postfix);
} }
/** /**
@ -105,7 +105,7 @@ class Files {
* @since 5.0.0 * @since 5.0.0
*/ */
public static function tmpFolder() { public static function tmpFolder() {
return(\OC_Helper::tmpFolder()); return \OC::$server->getTempManager()->getTemporaryFolder();
} }
/** /**

2
lib/public/util.php
View File

@ -395,7 +395,7 @@ class Util {
* @since 4.0.0 * @since 4.0.0
*/ */
public static function imagePath( $app, $image ) { public static function imagePath( $app, $image ) {
return(\OC_Helper::imagePath( $app, $image )); return \OC::$server->getURLGenerator()->imagePath($app, $image);
} }
/** /**