Merge "wikibits: Add some missing deprecation messages"

[lhc/web/wiklou.git] / includes / utils / Cdb.php

diff --git a/includes/utils/Cdb.php b/includes/utils/Cdb.php
index 81c0afe..c6de088 100644 (file)
--- a/includes/utils/Cdb.php
+++ b/includes/utils/Cdb.php
@@ -35,10 +35,11 @@ abstract class CdbReader {
         */
        public static function open( $fileName ) {
                if ( self::haveExtension() ) {
-                       return new CdbReader_DBA( $fileName );
+                       return new CdbReaderDBA( $fileName );
                } else {
                        wfDebug( "Warning: no dba extension found, using emulation.\n" );
-                       return new CdbReader_PHP( $fileName );
+
+                       return new CdbReaderPHP( $fileName );
                }
        }
 
@@ -55,6 +56,7 @@ abstract class CdbReader {
                if ( !in_array( 'cdb', $handlers ) || !in_array( 'cdb_make', $handlers ) ) {
                        return false;
                }
+
                return true;
        }
 
@@ -87,14 +89,15 @@ abstract class CdbWriter {
         *
         * @param $fileName string
         *
-        * @return CdbWriter_DBA|CdbWriter_PHP
+        * @return CdbWriterDBA|CdbWriterPHP
         */
        public static function open( $fileName ) {
                if ( CdbReader::haveExtension() ) {
-                       return new CdbWriter_DBA( $fileName );
+                       return new CdbWriterDBA( $fileName );
                } else {
                        wfDebug( "Warning: no dba extension found, using emulation.\n" );
-                       return new CdbWriter_PHP( $fileName );
+
+                       return new CdbWriterPHP( $fileName );
                }
        }
 
@@ -122,7 +125,7 @@ abstract class CdbWriter {
 /**
  * Reader class which uses the DBA extension
  */
-class CdbReader_DBA {
+class CdbReaderDBA {
        var $handle;
 
        function __construct( $fileName ) {
@@ -147,7 +150,7 @@ class CdbReader_DBA {
 /**
  * Writer class which uses the DBA extension
  */
-class CdbWriter_DBA {
+class CdbWriterDBA {
        var $handle, $realFileName, $tmpFileName;
 
        function __construct( $fileName ) {