Fix NS_PROJECT_TALK (bug #7792)

[lhc/web/wiklou.git] / includes / DatabaseFunctions.php

diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php
index 0618950..ca83b9e 100644 (file)
--- a/includes/DatabaseFunctions.php
+++ b/includes/DatabaseFunctions.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Backwards compatibility wrapper for Database.php
- *
- * Note: $wgDatabase has ceased to exist. Destroy all references.
+ * Legacy database functions, for compatibility with pre-1.3 code
+ * NOTE: this file is no longer loaded by default.
  *
  * @package MediaWiki
  */
@@ -10,15 +9,14 @@
 /**
  * Usually aborts on failure
  * If errors are explicitly ignored, returns success
- * @param string $sql SQL query
- * @param mixed $db database handler
- * @param string $fname name of the php function calling
+ * @param $sql String: SQL query
+ * @param $db Mixed: database handler
+ * @param $fname String: name of the php function calling
  */
 function wfQuery( $sql, $db, $fname = '' ) {
-       global $wgOut;
        if ( !is_numeric( $db ) ) {
                # Someone has tried to call this the old way
-               $wgOut->fatalError( wfMsgNoDB( 'wrong_wfQuery_params', $db, $sql ) );
+               throw new FatalError( wfMsgNoDB( 'wrong_wfQuery_params', $db, $sql ) );
        }
        $c =& wfGetDB( $db );
        if ( $c !== false ) {
@@ -30,10 +28,10 @@ function wfQuery( $sql, $db, $fname = '' ) {
 
 /**
  *
- * @param string $sql SQL query
+ * @param $sql String: SQL query
  * @param $dbi
- * @param string $fname name of the php function calling
- * @return array first row from the database
+ * @param $fname String: name of the php function calling
+ * @return Array: first row from the database
  */
 function wfSingleQuery( $sql, $dbi, $fname = '' ) {
        $db =& wfGetDB( $dbi );
@@ -44,15 +42,6 @@ function wfSingleQuery( $sql, $dbi, $fname = '' ) {
        return $ret;
 }
 
-/*
- * @todo document function
- */
-function &wfGetDB( $db = DB_LAST, $groups = array() ) {
-       global $wgLoadBalancer;
-       $ret =& $wgLoadBalancer->getConnection( $db, true, $groups );
-       return $ret;
-}
-
 /**
  * Turns on (false) or off (true) the automatic generation and sending
  * of a "we're sorry, but there has been a database error" page on
@@ -74,13 +63,13 @@ function wfIgnoreSQLErrors( $newstate, $dbi = DB_LAST ) {
 }
 
 /**#@+
- * @param $res database result handler
+ * @param $res Database result handler
  * @param $dbi
 */
 
 /**
  * Free a database result
- * @return bool whether result is sucessful or not
+ * @return Bool: whether result is sucessful or not.
  */
 function wfFreeResult( $res, $dbi = DB_LAST )
 {
@@ -147,7 +136,9 @@ function wfNumFields( $res, $dbi = DB_LAST ) {
 
 /**
  * Return name of a field in a result
- * @param integer $n id of the field
+ * @param $res Mixed: Ressource link see Database::fieldName()
+ * @param $n Integer: id of the field
+ * @param $dbi Default DB_LAST
  * @return string|false name of field
  */
 function wfFieldName( $res, $n, $dbi = DB_LAST )
@@ -234,7 +225,13 @@ function wfLastDBquery( $dbi = DB_LAST ) {
 }
 
 /**
+ * @see Database::Set()
  * @todo document function
+ * @param $table
+ * @param $var
+ * @param $value
+ * @param $cond
+ * @param $dbi Default DB_MASTER
  */
 function wfSetSQL( $table, $var, $value, $cond, $dbi = DB_MASTER )
 {
@@ -248,7 +245,12 @@ function wfSetSQL( $table, $var, $value, $cond, $dbi = DB_MASTER )
 
 
 /**
+ * @see Database::selectField()
  * @todo document function
+ * @param $table
+ * @param $var
+ * @param $cond Default ''
+ * @param $dbi Default DB_LAST
  */
 function wfGetSQL( $table, $var, $cond='', $dbi = DB_LAST )
 {
@@ -261,7 +263,12 @@ function wfGetSQL( $table, $var, $cond='', $dbi = DB_LAST )
 }
 
 /**
+ * @see Database::fieldExists()
  * @todo document function
+ * @param $table
+ * @param $field
+ * @param $dbi Default DB_LAST
+ * @return Result of Database::fieldExists() or false.
  */
 function wfFieldExists( $table, $field, $dbi = DB_LAST ) {
        $db =& wfGetDB( $dbi );
@@ -273,7 +280,12 @@ function wfFieldExists( $table, $field, $dbi = DB_LAST ) {
 }
 
 /**
+ * @see Database::indexExists()
  * @todo document function
+ * @param $table String
+ * @param $index
+ * @param $dbi Default DB_LAST
+ * @return Result of Database::indexExists() or false.
  */
 function wfIndexExists( $table, $index, $dbi = DB_LAST ) {
        $db =& wfGetDB( $dbi );
@@ -285,7 +297,13 @@ function wfIndexExists( $table, $index, $dbi = DB_LAST ) {
 }
 
 /**
+ * @see Database::insert()
  * @todo document function
+ * @param $table String
+ * @param $array Array
+ * @param $fname String, default 'wfInsertArray'.
+ * @param $dbi Default DB_MASTER
+ * @return result of Database::insert() or false.
  */
 function wfInsertArray( $table, $array, $fname = 'wfInsertArray', $dbi = DB_MASTER ) {
        $db =& wfGetDB( $dbi );
@@ -297,7 +315,14 @@ function wfInsertArray( $table, $array, $fname = 'wfInsertArray', $dbi = DB_MAST
 }
 
 /**
+ * @see Database::getArray()
  * @todo document function
+ * @param $table String
+ * @param $vars
+ * @param $conds
+ * @param $fname String, default 'wfGetArray'.
+ * @param $dbi Default DB_LAST
+ * @return result of Database::getArray() or false.
  */
 function wfGetArray( $table, $vars, $conds, $fname = 'wfGetArray', $dbi = DB_LAST ) {
        $db =& wfGetDB( $dbi );
@@ -309,6 +334,13 @@ function wfGetArray( $table, $vars, $conds, $fname = 'wfGetArray', $dbi = DB_LAS
 }
 
 /**
+ * @see Database::update()
+ * @param $table String
+ * @param $values
+ * @param $conds
+ * @param $fname String, default 'wfUpdateArray'
+ * @param $dbi Default DB_MASTER
+ * @return Result of Database::update()) or false;
  * @todo document function
  */
 function wfUpdateArray( $table, $values, $conds, $fname = 'wfUpdateArray', $dbi = DB_MASTER ) {