From: Antoine Musso <hashar@users.mediawiki.org>
Date: Thu, 2 Dec 2010 19:33:15 +0000 (+0000)
Subject: pipe does not look nice in doxygen. fu r77499
X-Git-Tag: 1.31.0-rc.0~33638
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=5cdd7614d54755be4b06607dd6f8f4cee3b8fe66;p=lhc%2Fweb%2Fwiklou.git

pipe does not look nice in doxygen. fu r77499
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 12c5cd5a06..8319c369f2 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3206,7 +3206,7 @@ function wfFindFile( $title, $options = array() ) {
 /**
  * Get an object referring to a locally registered file.
  * Returns a valid placeholder object if the file does not exist.
- * @param $title Title|String
+ * @param $title Title or String
  * @return File, or null if passed an invalid Title
  */
 function wfLocalFile( $title ) {
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 3ff4145ec7..f3ab526daa 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -604,7 +604,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *     comment (you can use __METHOD__ or add some extra info)
 	 * @param  $tempIgnore Boolean:   Whether to avoid throwing an exception on errors...
 	 *     maybe best to catch the exception instead?
-	 * @return boolean|ResultWrapper true for a successful write query, ResultWrapper object for a successful read query,
+	 * @return boolean or ResultWrapper. true for a successful write query, ResultWrapper object for a successful read query,
 	 *     or false on failure if $tempIgnore set
 	 * @throws DBQueryError Thrown when the database returns an error of any kind
 	 */