| Property changes on: branches/REL1_16/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/includes/HistoryPage.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/includes/api:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/includes/ChangesList.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/phase3/includes/json/Services_JSON.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /trunk/phase3/includes/OutputPage.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /trunk/phase3/includes/ConfEditor.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/LocalisationCache.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /trunk/phase3/includes/LocalisationCache.php:r63549 |
| Property changes on: branches/REL1_16/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /trunk/phase3/includes/specials:r63549 |
| Property changes on: branches/REL1_16/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/phase3/includes:r63549 |
| Index: branches/REL1_16/phase3/maintenance/rebuildtextindex.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | $this->mDescription = "Rebuild search index table from scratch"; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | | - protected function getDbType() { |
| | 39 | + public function getDbType() { |
| 40 | 40 | return Maintenance::DB_ADMIN; |
| 41 | 41 | } |
| 42 | 42 | |
| Index: branches/REL1_16/phase3/maintenance/updateSearchIndex.php |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | $this->addOption( 'l', 'How long the searchindex and revision tables will be locked for', false, true ); |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | | - protected function getDbType() { |
| | 44 | + public function getDbType() { |
| 45 | 45 | return Maintenance::DB_ADMIN; |
| 46 | 46 | } |
| 47 | 47 | |
| Property changes on: branches/REL1_16/phase3/maintenance/moveBatch.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /trunk/phase3/maintenance/moveBatch.php:r63549 |
| Index: branches/REL1_16/phase3/maintenance/addwiki.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | $this->addArg( 'dbname', 'Name of database to create' ); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | | - protected function getDbType() { |
| | 42 | + public function getDbType() { |
| 43 | 43 | return Maintenance::DB_ADMIN; |
| 44 | 44 | } |
| 45 | 45 | |
| Index: branches/REL1_16/phase3/maintenance/checkSyntax.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | $this->addOption( 'syntax-only', 'Check for syntax validity only, skip code style warnings' ); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | | - protected function getDbType() { |
| | 43 | + public function getDbType() { |
| 44 | 44 | return Maintenance::DB_NONE; |
| 45 | 45 | } |
| 46 | 46 | |
| Property changes on: branches/REL1_16/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /trunk/phase3/maintenance/cleanupTable.inc:r63549 |
| Property changes on: branches/REL1_16/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r63549 |
| Index: branches/REL1_16/phase3/maintenance/findhooks.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | $this->addOption( 'online', 'Check against mediawiki.org hook documentation' ); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | | - protected function getDbType() { |
| | 47 | + public function getDbType() { |
| 48 | 48 | return Maintenance::DB_NONE; |
| 49 | 49 | } |
| 50 | 50 | |
| Index: branches/REL1_16/phase3/maintenance/renamewiki.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | $this->addArg( 'newdb', 'New DB name' ); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | | - protected function getDbType() { |
| | 37 | + public function getDbType() { |
| 38 | 38 | return Maintenance::DB_ADMIN; |
| 39 | 39 | } |
| 40 | 40 | |
| Index: branches/REL1_16/phase3/maintenance/renameDbPrefix.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | $this->addOption( "new", "New db prefix [0 for none]", true, true ); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | | - protected function getDbType() { |
| | 34 | + public function getDbType() { |
| 35 | 35 | return Maintenance::DB_ADMIN; |
| 36 | 36 | } |
| 37 | 37 | |
| Index: branches/REL1_16/phase3/maintenance/runBatchedQuery.php |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | } while ( $affected > 0 ); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | | - protected function getDbType() { |
| | 54 | + public function getDbType() { |
| 55 | 55 | return Maintenance::DB_ADMIN; |
| 56 | 56 | } |
| 57 | 57 | } |
| Index: branches/REL1_16/phase3/maintenance/commandLine.inc |
| — | — | @@ -18,7 +18,7 @@ |
| 19 | 19 | } |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | | - protected function getDbType() { |
| | 22 | + public function getDbType() { |
| 23 | 23 | global $wgUseNormalUser; |
| 24 | 24 | |
| 25 | 25 | return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ? |
| Index: branches/REL1_16/phase3/maintenance/patchSql.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | $this->addArg( 'patch-name', 'Name of the patch file, either full path or in maintenance/archives' ); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | | - protected function getDbType() { |
| | 34 | + public function getDbType() { |
| 35 | 35 | return Maintenance::DB_ADMIN; |
| 36 | 36 | } |
| 37 | 37 | |
| Index: branches/REL1_16/phase3/maintenance/sqlite.php |
| — | — | @@ -35,7 +35,7 @@ |
| 36 | 36 | * While we use database connection, this simple lie prevents useless --dbpass and |
| 37 | 37 | * --dbuser options from appearing in help message for this script. |
| 38 | 38 | */ |
| 39 | | - protected function getDbType() { |
| | 39 | + public function getDbType() { |
| 40 | 40 | return Maintenance::DB_NONE; |
| 41 | 41 | } |
| 42 | 42 | |
| Index: branches/REL1_16/phase3/maintenance/sql.php |
| — | — | @@ -70,7 +70,7 @@ |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | | - protected function getDbType() { |
| | 74 | + public function getDbType() { |
| 75 | 75 | return Maintenance::DB_ADMIN; |
| 76 | 76 | } |
| 77 | 77 | } |
| Property changes on: branches/REL1_16/phase3/skins/common/jquery.min.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 78 | 78 | Merged /trunk/phase3/skins/common/jquery.min.js:r63549 |
| Property changes on: branches/REL1_16/phase3/skins/common/jquery.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 79 | 79 | Merged /trunk/phase3/skins/common/jquery.js:r63549 |
| Property changes on: branches/REL1_16/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 80 | 80 | Merged /trunk/phase3:r63549 |