Merge "(bug 41470) Use numParams in Language::formatDuration"

[lhc/web/wiklou.git] / includes / SqlDataUpdate.php

diff --git a/includes/SqlDataUpdate.php b/includes/SqlDataUpdate.php
index 256e8f7..d0ead9a 100644 (file)
--- a/includes/SqlDataUpdate.php
+++ b/includes/SqlDataUpdate.php
@@ -95,7 +95,7 @@ abstract class SqlDataUpdate extends DataUpdate {
         * Abort the database transaction started via beginTransaction (if any).
         */
        public function abortTransaction() {
-               if ( $this->mHasTransaction ) {
+               if ( $this->mHasTransaction ) { //XXX: actually... maybe always?
                        $this->mDb->rollback( get_class( $this ) . '::abortTransaction' );
                        $this->mHasTransaction = false;
                }
@@ -109,7 +109,7 @@ abstract class SqlDataUpdate extends DataUpdate {
         * @param $dbkeys Array
         */
        protected function invalidatePages( $namespace, array $dbkeys ) {
-               if ( !count( $dbkeys ) ) {
+               if ( $dbkeys === array() ) {
                        return;
                }
 
@@ -127,10 +127,12 @@ abstract class SqlDataUpdate extends DataUpdate {
                                'page_touched < ' . $this->mDb->addQuotes( $now )
                        ), __METHOD__
                );
+
                foreach ( $res as $row ) {
                        $ids[] = $row->page_id;
                }
-               if ( !count( $ids ) ) {
+
+               if ( $ids === array() ) {
                        return;
                }