http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72133

Revision: 72133
Author:   demon
Date:     2010-09-01 18:10:02 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
Reduce some duplication, just implement stub in parent

Modified Paths:
--------------
    trunk/phase3/includes/installer/DatabaseInstaller.php
    trunk/phase3/includes/installer/OracleInstaller.php
    trunk/phase3/includes/installer/PostgresInstaller.php
    trunk/phase3/includes/installer/SqliteInstaller.php

Modified: trunk/phase3/includes/installer/DatabaseInstaller.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseInstaller.php       2010-09-01 
18:09:27 UTC (rev 72132)
+++ trunk/phase3/includes/installer/DatabaseInstaller.php       2010-09-01 
18:10:02 UTC (rev 72133)
@@ -80,7 +80,9 @@
         * If the DB type has no settings beyond those already configured with 
         * getConnectForm(), this should return false.
         */
-       public abstract function getSettingsForm();
+       public function getSettingsForm() {
+               return false;
+       }
 
        /**
         * Set variables based on the request array, assuming it was submitted 
via
@@ -88,7 +90,9 @@
         * 
         * @return Status
         */
-       public abstract function submitSettingsForm();
+       public function submitSettingsForm() {
+               return Status::newGood();
+       }
 
        /**
         * Connect to the database using the administrative user/password 
currently

Modified: trunk/phase3/includes/installer/OracleInstaller.php
===================================================================
--- trunk/phase3/includes/installer/OracleInstaller.php 2010-09-01 18:09:27 UTC 
(rev 72132)
+++ trunk/phase3/includes/installer/OracleInstaller.php 2010-09-01 18:10:02 UTC 
(rev 72133)
@@ -88,15 +88,6 @@
                return $status;
        }
 
-
-       public function getSettingsForm() {
-               // TODO
-       }
-       
-       public function submitSettingsForm() {
-               // TODO
-       }
-
        public function getConnection() {
                // TODO
        }

Modified: trunk/phase3/includes/installer/PostgresInstaller.php
===================================================================
--- trunk/phase3/includes/installer/PostgresInstaller.php       2010-09-01 
18:09:27 UTC (rev 72132)
+++ trunk/phase3/includes/installer/PostgresInstaller.php       2010-09-01 
18:10:02 UTC (rev 72133)
@@ -112,14 +112,6 @@
                return $status;
        }
 
-       function getSettingsForm() {
-               return false;
-       }
-
-       function submitSettingsForm() {
-               return Status::newGood();
-       }
-
        function setupDatabase() {
        }
 

Modified: trunk/phase3/includes/installer/SqliteInstaller.php
===================================================================
--- trunk/phase3/includes/installer/SqliteInstaller.php 2010-09-01 18:09:27 UTC 
(rev 72132)
+++ trunk/phase3/includes/installer/SqliteInstaller.php 2010-09-01 18:10:02 UTC 
(rev 72133)
@@ -122,14 +122,6 @@
                return parent::needsUpgrade();
        }
 
-       public function getSettingsForm() {
-               return false;
-       }
-
-       public function submitSettingsForm() {
-               return Status::newGood();
-       }
-
        public function setupDatabase() {
                $dir = $this->getVar( 'wgSQLiteDataDir' );
 



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to