r96426 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96425‎ | r96426 | r96427 >
Date:12:54, 7 September 2011
Author:catrope
Status:ok
Tags:
Comment:
Some comment and whitespace fixes
Modified paths:
  • /trunk/phase3/includes/Article.php (modified) (history)
  • /trunk/phase3/includes/WikiPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Article.php
@@ -1993,7 +1993,6 @@
19941994 *
19951995 * @param $fname String Field name
19961996 * @param $fvalue mixed New value
1997 - * @param $args Array Arguments to the method
19981997 */
19991998 public function __set( $fname, $fvalue ) {
20001999 if ( property_exists( $this->mPage, $fname ) ) {
@@ -2003,7 +2002,7 @@
20042003 } elseif ( !in_array( $fname, array( 'mContext', 'mPage' ) ) ) {
20052004 $this->mPage->$fname = $fvalue;
20062005 } else {
2007 - trigger_error( 'Inaccessible property via __get(): ' . $fname, E_USER_NOTICE );
 2006+ trigger_error( 'Inaccessible property via __set(): ' . $fname, E_USER_NOTICE );
20082007 }
20092008 }
20102009
Index: trunk/phase3/includes/WikiPage.php
@@ -164,11 +164,11 @@
165165 $dbw = wfGetDB( DB_MASTER );
166166 $dbw->replace( 'redirect', array( 'rd_from' ),
167167 array(
168 - 'rd_from' => $this->getId(),
169 - 'rd_namespace' => $rt->getNamespace(),
170 - 'rd_title' => $rt->getDBkey(),
171 - 'rd_fragment' => $rt->getFragment(),
172 - 'rd_interwiki' => $rt->getInterwiki(),
 168+ 'rd_from' => $this->getId(),
 169+ 'rd_namespace' => $rt->getNamespace(),
 170+ 'rd_title' => $rt->getDBkey(),
 171+ 'rd_fragment' => $rt->getFragment(),
 172+ 'rd_interwiki' => $rt->getInterwiki(),
173173 ),
174174 __METHOD__
175175 );
@@ -799,7 +799,7 @@
800800 *
801801 * @param $dbw DatabaseBase: object
802802 * @param $revision Revision: For ID number, and text used to set
803 - length and redirect status fields
 803+ * length and redirect status fields
804804 * @param $lastRevision Integer: if given, will not overwrite the page field
805805 * when different from the currently set value.
806806 * Giving 0 indicates the new page flag should be set
@@ -1030,7 +1030,7 @@
10311031 * Fill in blank summaries with generated text where possible
10321032 *
10331033 * If neither EDIT_NEW nor EDIT_UPDATE is specified, the status of the article will be detected.
1034 - * If EDIT_UPDATE is specified and the article doesn't exist, the function will an
 1034+ * If EDIT_UPDATE is specified and the article doesn't exist, the function will return an
10351035 * edit-gone-missing error. If EDIT_NEW is specified and the article does exist, an
10361036 * edit-already-exists error will be returned. These two conditions are also possible with
10371037 * auto-detection due to MediaWiki's performance-optimised locking strategy.
@@ -1806,7 +1806,7 @@
18071807 * and return value documentation
18081808 *
18091809 * NOTE: This function does NOT check ANY permissions, it just commits the
1810 - * rollback to the DB Therefore, you should only call this function direct-
 1810+ * rollback to the DB. Therefore, you should only call this function direct-
18111811 * ly if you want to use custom permissions checks. If you don't, use
18121812 * doRollback() instead.
18131813 * @param $fromP String: Name of the user whose edits to rollback.

Status & tagging log