Ensure users are able to edit the page after changing the content model

[lhc/web/wiklou.git] / includes / db / DatabaseUtility.php

diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php
index 7fcb68e..aeaa27f 100644 (file)
--- a/includes/db/DatabaseUtility.php
+++ b/includes/db/DatabaseUtility.php
@@ -210,7 +210,7 @@ class ResultWrapper implements Iterator {
  */
 class FakeResultWrapper extends ResultWrapper {
        /** @var array */
-       public $result = array();
+       public $result = [];
 
        /** @var null And it's going to stay that way :D */
        protected $db = null;
@@ -314,7 +314,7 @@ class LikeMatch {
 }
 
 /**
- * An object representing a master or slave position in a replicated setup.
+ * An object representing a master or replica DB position in a replicated setup.
  *
  * The implementation details of this opaque type are up to the database subclass.
  */
@@ -332,6 +332,13 @@ interface DBMasterPos {
         */
        public function hasReached( DBMasterPos $pos );
 
+       /**
+        * @param DBMasterPos $pos
+        * @return bool Whether this position appears to be for the same channel as another
+        * @since 1.27
+        */
+       public function channelsMatch( DBMasterPos $pos );
+
        /**
         * @return string
         * @since 1.27