X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=blobdiff_plain;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabase.php;h=1779880d2719cc65731cfc2860846ac69a4afc4c;hb=78c3b9c21a15030b7ac1cf15c2ae1806dd3d10db;hp=f6817950ed690c164935e8c65ca3045211e0cec7;hpb=4e7673c5b0aa1d53e69c850ccc58446abf29b3d5;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index f6817950ed..1779880d27 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -1181,8 +1181,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware } else { # Nothing prior was there to lose from the transaction, # so just roll it back. - $this->doRollback( __METHOD__ . " ($fname)" ); - $this->trxStatus = self::STATUS_TRX_OK; + $this->rollback( __METHOD__ . " ($fname)", self::FLUSHING_INTERNAL ); } $this->trxStatusIgnoredCause = null; } else {