Merge "Document that IContextSource::getTitle can return null"

[lhc/web/wiklou.git] / includes / externalstore / ExternalStoreDB.php

diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php
index 5e7b323..5774a24 100644 (file)
--- a/includes/externalstore/ExternalStoreDB.php
+++ b/includes/externalstore/ExternalStoreDB.php
@@ -106,8 +106,8 @@ class ExternalStoreDB extends ExternalStoreMedium {
        /**
         * Get a LoadBalancer for the specified cluster
         *
-        * @param string $cluster cluster name
-        * @return LoadBalancer object
+        * @param string $cluster Cluster name
+        * @return LoadBalancer
         */
        function getLoadBalancer( $cluster ) {
                $wiki = isset( $this->params['wiki'] ) ? $this->params['wiki'] : false;
@@ -118,8 +118,8 @@ class ExternalStoreDB extends ExternalStoreMedium {
        /**
         * Get a slave database connection for the specified cluster
         *
-        * @param string $cluster cluster name
-        * @return DatabaseBase object
+        * @param string $cluster Cluster name
+        * @return DatabaseBase
         */
        function getSlave( $cluster ) {
                global $wgDefaultExternalStore;
@@ -128,10 +128,10 @@ class ExternalStoreDB extends ExternalStoreMedium {
                $lb = $this->getLoadBalancer( $cluster );
 
                if ( !in_array( "DB://" . $cluster, (array)$wgDefaultExternalStore ) ) {
-                       wfDebug( "read only external store" );
+                       wfDebug( "read only external store\n" );
                        $lb->allowLagged( true );
                } else {
-                       wfDebug( "writable external store" );
+                       wfDebug( "writable external store\n" );
                }
 
                return $lb->getConnection( DB_SLAVE, array(), $wiki );
@@ -140,8 +140,8 @@ class ExternalStoreDB extends ExternalStoreMedium {
        /**
         * Get a master database connection for the specified cluster
         *
-        * @param string $cluster cluster name
-        * @return DatabaseBase object
+        * @param string $cluster Cluster name
+        * @return DatabaseBase
         */
        function getMaster( $cluster ) {
                $wiki = isset( $this->params['wiki'] ) ? $this->params['wiki'] : false;
@@ -153,8 +153,8 @@ class ExternalStoreDB extends ExternalStoreMedium {
        /**
         * Get the 'blobs' table name for this database
         *
-        * @param $db DatabaseBase
-        * @return String: table name ('blobs' by default)
+        * @param DatabaseBase $db
+        * @return string Table name ('blobs' by default)
         */
        function getTable( $db ) {
                $table = $db->getLBInfo( 'blobs table' );
@@ -169,9 +169,9 @@ class ExternalStoreDB extends ExternalStoreMedium {
         * Fetch a blob item out of the database; a cache of the last-loaded
         * blob will be kept so that multiple loads out of a multi-item blob
         * can avoid redundant database access and decompression.
-        * @param $cluster
-        * @param $id
-        * @param $itemID
+        * @param string $cluster
+        * @param string $id
+        * @param string $itemID
         * @return mixed
         * @private
         */