X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=616cc3d965a30c1d2c4d6c390b8d74fc5b760e1e;hb=17a9beebd642747072e9e60135d23f6a3cabeedd;hp=70673acb377b78c4921598969581bb90b320c1e8;hpb=8289433a6af75839110b4cd318a1cfb11b44c133;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Title.php b/includes/Title.php
index 70673acb37..616cc3d965 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * See title.txt
- *
+ * @file
  */
 
 /** */
@@ -192,12 +192,13 @@ class Title {
 	 *       but not used for anything else
 	 *
 	 * @param int $id the page_id corresponding to the Title to create
+	 * @param int $flags, use GAID_FOR_UPDATE to use master
 	 * @return Title the new object, or NULL on an error
 	 */
-	public static function newFromID( $id ) {
+	public static function newFromID( $id, $flags = 0 ) {
 		$fname = 'Title::newFromID';
-		$dbr = wfGetDB( DB_SLAVE );
-		$row = $dbr->selectRow( 'page', array( 'page_namespace', 'page_title' ),
+		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+		$row = $db->selectRow( 'page', array( 'page_namespace', 'page_title' ),
 			array( 'page_id' => $id ), $fname );
 		if ( $row !== false ) {
 			$title = Title::makeTitle( $row->page_namespace, $row->page_title );
@@ -696,16 +697,15 @@ class Title {
 	 * @return string Base name
 	 */
 	public function getBaseText() {
-		global $wgNamespacesWithSubpages;
-		if( !empty( $wgNamespacesWithSubpages[$this->mNamespace] ) ) {
-			$parts = explode( '/', $this->getText() );
-			# Don't discard the real title if there's no subpage involved
-			if( count( $parts ) > 1 )
-				unset( $parts[ count( $parts ) - 1 ] );
-			return implode( '/', $parts );
-		} else {
+		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
 			return $this->getText();
 		}
+
+		$parts = explode( '/', $this->getText() );
+		# Don't discard the real title if there's no subpage involved
+		if( count( $parts ) > 1 )
+			unset( $parts[ count( $parts ) - 1 ] );
+		return implode( '/', $parts );
 	}
 
 	/**
@@ -713,13 +713,11 @@ class Title {
 	 * @return string Subpage name
 	 */
 	public function getSubpageText() {
-		global $wgNamespacesWithSubpages;
-		if( isset( $wgNamespacesWithSubpages[ $this->mNamespace ] ) && $wgNamespacesWithSubpages[ $this->mNamespace ] ) {
-			$parts = explode( '/', $this->mTextform );
-			return( $parts[ count( $parts ) - 1 ] );
-		} else {
+		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
 			return( $this->mTextform );
 		}
+		$parts = explode( '/', $this->mTextform );
+		return( $parts[ count( $parts ) - 1 ] );
 	}
 
 	/**
@@ -1054,13 +1052,19 @@ class Title {
 	 * @return array Array of arrays of the arguments to wfMsg to explain permissions problems.
 	 */
 	public function getUserPermissionsErrors( $action, $user, $doExpensiveQueries = true ) {
+		if( !StubObject::isRealObject( $user ) ) {
+			//Since StubObject is always used on globals, we can unstub $wgUser here and set $user = $wgUser
+			global $wgUser;
+			$wgUser->_unstub( '', 5 );
+			$user = $wgUser;
+		}
 		$errors = $this->getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries );
 
 		global $wgContLang;
 		global $wgLang;
 		global $wgEmailConfirmToEdit;
 
-		if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() ) {
+		if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() && $action != 'createaccount' ) {
 			$errors[] = array( 'confirmedittext' );
 		}
 
@@ -1157,8 +1161,9 @@ class Title {
 			else if ($result === false )
 				$errors[] = array('badaccess-group0'); # a generic "We don't want them to do that"
 		}
-
-		if( NS_SPECIAL == $this->mNamespace ) {
+		
+		$specialOKActions = array( 'createaccount', 'execute' );
+		if( NS_SPECIAL == $this->mNamespace && !in_array( $action, $specialOKActions) ) {
 			$errors[] = array('ns-specialprotected');
 		}
 
@@ -1214,15 +1219,10 @@ class Title {
 				$right = 'protect';
 			}
 			if( '' != $right && !$user->isAllowed( $right ) ) {
-				//Users with 'editprotected' permission can edit protected pages
-				if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) {
-					//Users with 'editprotected' permission cannot edit protected pages
-					//with cascading option turned on.
-					if($this->mCascadeRestriction) {
-						$errors[] = array( 'protectedpagetext', $right );
-					} else {
-						//Nothing, user can edit!
-					}
+				// Users with 'editprotected' permission can edit protected
+				// pages if protection is not with cascading option turned on.
+				if( $action=='edit' && $user->isAllowed( 'editprotected' ) && !$this->areRestrictionsCascading() ) {
+					// Nothing, user can edit!
 				} else {
 					$errors[] = array( 'protectedpagetext', $right );
 				}
@@ -1444,7 +1444,9 @@ class Title {
 			 * Check for explicit whitelisting
 			 */
 			$name = $this->getPrefixedText();
-			if( in_array( $name, $wgWhitelistRead, true ) )
+			$dbName = $this->getPrefixedDBKey();
+			// Check with and without underscores
+			if( in_array($name,$wgWhitelistRead,true) || in_array($dbName,$wgWhitelistRead,true) )
 				return true;
 
 			/**
@@ -1490,13 +1492,35 @@ class Title {
 	 * @return bool
 	 */
 	public function isSubpage() {
-		global $wgNamespacesWithSubpages;
+		return MWNamespace::hasSubpages( $this->mNamespace )
+			? strpos( $this->getText(), '/' ) !== false
+			: false;
+	}
 
-		if( isset( $wgNamespacesWithSubpages[ $this->mNamespace ] ) ) {
-			return ( strpos( $this->getText(), '/' ) !== false && $wgNamespacesWithSubpages[ $this->mNamespace ] == true );
-		} else {
+	/**
+	 * Does this have subpages?  (Warning, usually requires an extra DB query.)
+	 * @return bool
+	 */
+	public function hasSubpages() {
+		if( !MWNamespace::hasSubpages( $this->mNamespace ) ) {
+			# Duh
 			return false;
 		}
+
+		# We dynamically add a member variable for the purpose of this method
+		# alone to cache the result.  There's no point in having it hanging
+		# around uninitialized in every Title object; therefore we only add it
+		# if needed and don't declare it statically.
+		if( isset( $this->mHasSubpages ) ) {
+			return $this->mHasSubpages;
+		}
+
+		$db = wfGetDB( DB_SLAVE );
+		return $this->mHasSubpages = (bool)$db->selectField( 'page', '1',
+			"page_namespace = {$this->mNamespace} AND page_title LIKE '"
+			. $db->escapeLike( $this->mDbkeyform ) . "/%'",
+			__METHOD__
+		);
 	}
 
 	/**
@@ -1582,16 +1606,13 @@ class Title {
 	 * The restriction array is an array of each type, each of which contains an array of unique groups
 	 */
 	public function getCascadeProtectionSources( $get_pages = true ) {
-		global $wgEnableCascadingProtection, $wgRestrictionTypes;
+		global $wgRestrictionTypes;
 
 		# Define our dimension of restrictions types
 		$pagerestrictions = array();
 		foreach( $wgRestrictionTypes as $action )
 			$pagerestrictions[$action] = array();
 
-		if (!$wgEnableCascadingProtection)
-			return array( false, $pagerestrictions );
-
 		if ( isset( $this->mCascadeSources ) && $get_pages ) {
 			return array( $this->mCascadeSources, $this->mCascadingRestrictions );
 		} else if ( isset( $this->mHasCascadingRestrictions ) && !$get_pages ) {
@@ -1600,7 +1621,7 @@ class Title {
 
 		wfProfileIn( __METHOD__ );
 
-		$dbr = wfGetDb( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 
 		if ( $this->getNamespace() == NS_IMAGE ) {
 			$tables = array ('imagelinks', 'page_restrictions');
@@ -1694,7 +1715,8 @@ class Title {
 		# Backwards-compatibility: also load the restrictions from the page record (old format).
 
 		if ( $oldFashionedRestrictions === NULL ) {
-			$oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions', array( 'page_id' => $this->getArticleId() ), __METHOD__ );
+			$oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions', 
+				array( 'page_id' => $this->getArticleId() ), __METHOD__ );
 		}
 
 		if ($oldFashionedRestrictions != '') {
@@ -1900,10 +1922,10 @@ class Title {
 		if ($this->mLatestID !== false)
 			return $this->mLatestID;
 
-		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB(DB_MASTER) : wfGetDB(DB_SLAVE);
+		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
 		return $this->mLatestID = $db->selectField( 'revision',
 			"max(rev_id)",
-			array('rev_page' => $this->getArticleID()),
+			array('rev_page' => $this->getArticleID($flags)),
 			'Title::getLatestRevID' );
 	}
 
@@ -2363,34 +2385,36 @@ class Title {
 
 	/**
 	 * Check whether a given move operation would be valid.
-	 * Returns true if ok, or a message key string for an error message
-	 * if invalid. (Scarrrrry ugly interface this.)
+	 * Returns true if ok, or a getUserPermissionsErrors()-like array otherwise
 	 * @param Title &$nt the new title
 	 * @param bool $auth indicates whether $wgUser's permissions
 	 * 	should be checked
-	 * @return mixed true on success, message name on failure
+	 * @return mixed True on success, getUserPermissionsErrors()-like array on failure
 	 */
 	public function isValidMoveOperation( &$nt, $auth = true ) {
-		if( !$this or !$nt ) {
-			return 'badtitletext';
+		$errors = array();	
+		if( !$nt ) {
+			// Normally we'd add this to $errors, but we'll get
+			// lots of syntax errors if $nt is not an object
+			return array(array('badtitletext'));
 		}
 		if( $this->equals( $nt ) ) {
-			return 'selfmove';
+			$errors[] = array('selfmove');
 		}
 		if( !$this->isMovable() || !$nt->isMovable() ) {
-			return 'immobile_namespace';
+			$errors[] = array('immobile_namespace');
 		}
 
 		$oldid = $this->getArticleID();
 		$newid = $nt->getArticleID();
 
 		if ( strlen( $nt->getDBkey() ) < 1 ) {
-			return 'articleexists';
+			$errors[] = array('articleexists');
 		}
 		if ( ( '' == $this->getDBkey() ) ||
 			 ( !$oldid ) ||
 		     ( '' == $nt->getDBkey() ) ) {
-			return 'badarticleerror';
+			$errors[] = array('badarticleerror');
 		}
 
 		// Image-specific checks
@@ -2398,28 +2422,27 @@ class Title {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
 				if( $nt->getNamespace() != NS_IMAGE ) {
-					return 'imagenocrossnamespace';
+					$errors[] = array('imagenocrossnamespace');
 				}
 				if( !File::checkExtensionCompatibility( $file, $nt->getDbKey() ) ) {
-					return 'imagetypemismatch';
+					$errors[] = array('imagetypemismatch');
 				}
 			}
 		}
 
 		if ( $auth ) {
 			global $wgUser;
-			$errors = array_merge($this->getUserPermissionsErrors('move', $wgUser),
+			$errors = array_merge($errors, 
+					$this->getUserPermissionsErrors('move', $wgUser),
 					$this->getUserPermissionsErrors('edit', $wgUser),
 					$nt->getUserPermissionsErrors('move', $wgUser),
 					$nt->getUserPermissionsErrors('edit', $wgUser));
-			if($errors !== array())
-				return $errors[0][0];
 		}
 
 		global $wgUser;
 		$err = null;
 		if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err ) ) ) {
-			return 'hookaborted';
+			$errors[] = array('hookaborted', $err);
 		}
 
 		# The move is allowed only if (1) the target doesn't exist, or
@@ -2428,15 +2451,18 @@ class Title {
 
 		if ( 0 != $newid ) { # Target exists; check for validity
 			if ( ! $this->isValidMoveTarget( $nt ) ) {
-				return 'articleexists';
+				$errors[] = array('articleexists');
 			}
 		} else {
 			$tp = $nt->getTitleProtection();
-			if ( $tp and !$wgUser->isAllowed( $tp['pt_create_perm'] ) ) {
-				return 'cantmove-titleprotected';
+			$right = ( $tp['pt_create_perm'] == 'sysop' ) ? 'protect' : $tp['pt_create_perm'];
+			if ( $tp and !$wgUser->isAllowed( $right ) ) {
+				$errors[] = array('cantmove-titleprotected');
 			}
 		}
-		return true;
+		if(empty($errors))
+			return true;
+		return $errors;
 	}
 
 	/**
@@ -2447,11 +2473,11 @@ class Title {
 	 * @param string $reason The reason for the move
 	 * @param bool $createRedirect Whether to create a redirect from the old title to the new title.
 	 *  Ignored if the user doesn't have the suppressredirect right.
-	 * @return mixed true on success, message name on failure
+	 * @return mixed true on success, getUserPermissionsErrors()-like array on failure
 	 */
 	public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
 		$err = $this->isValidMoveOperation( $nt, $auth );
-		if( is_string( $err ) ) {
+		if( is_array( $err ) ) {
 			return $err;
 		}
 
@@ -2463,7 +2489,8 @@ class Title {
 			$err = $this->moveToNewTitle( $nt, $reason, $createRedirect );
 			$pageCountChange = ($createRedirect ? 1 : 0);
 		}
-		if( is_string( $err ) ) {
+
+		if( is_array( $err ) ) {
 			return $err;
 		}
 		$redirid = $this->getArticleID();
@@ -2560,18 +2587,9 @@ class Title {
 		$now = wfTimestampNow();
 		$newid = $nt->getArticleID();
 		$oldid = $this->getArticleID();
-		$dbw = wfGetDB( DB_MASTER );
 
-		# Move an image if it is
-		if( $this->getNamespace() == NS_IMAGE ) {
-			$file = wfLocalFile( $this );
-			if( $file->exists() ) {
-				$status = $file->move( $nt );
-				if( !$status->isOk() ) {
-					return $status->getWikiText();
-				}
-			}
-		}
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
 
 		# Delete the old redirect. We don't save it to history since
 		# by definition if we've got here it's rather uninteresting.
@@ -2595,6 +2613,9 @@ class Title {
 		# Save a null revision in the page's history notifying of the move
 		$nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
 		$nullRevId = $nullRevision->insertOn( $dbw );
+		
+		$article = new Article( $this );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
 
 		# Change the name of the target page:
 		$dbw->update( 'page',
@@ -2610,8 +2631,7 @@ class Title {
 		$nt->resetArticleID( $oldid );
 
 		# Recreate the redirect, this time in the other direction.
-		if($createRedirect || !$wgUser->isAllowed('suppressredirect'))
-		{
+		if( $createRedirect || !$wgUser->isAllowed('suppressredirect') ) {
 			$mwRedir = MagicWord::get( 'redirect' );
 			$redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
 			$redirectArticle = new Article( $this );
@@ -2622,6 +2642,8 @@ class Title {
 				'text'    => $redirectText ) );
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
+			
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
 
 			# Now, we record the link from the redirect to the new title.
 			# It should have no other outgoing links...
@@ -2635,6 +2657,19 @@ class Title {
 		} else {
 			$this->resetArticleID( 0 );
 		}
+		
+		# Move an image if this is a file
+		if( $this->getNamespace() == NS_IMAGE ) {
+			$file = wfLocalFile( $this );
+			if( $file->exists() ) {
+				$status = $file->move( $nt );
+				if( !$status->isOk() ) {
+					$dbw->rollback();
+					return $status->getErrorsArray();
+				}
+			}
+		}
+		$dbw->commit();
 
 		# Log the move
 		$log = new LogPage( 'move' );
@@ -2646,6 +2681,7 @@ class Title {
 			$u = new SquidUpdate( $urls );
 			$u->doUpdate();
 		}
+		
 	}
 
 	/**
@@ -2665,23 +2701,17 @@ class Title {
 
 		$newid = $nt->getArticleID();
 		$oldid = $this->getArticleID();
+		
 		$dbw = wfGetDB( DB_MASTER );
+		$dbw->begin();
 		$now = $dbw->timestamp();
 
-		# Move an image if it is
-		if( $this->getNamespace() == NS_IMAGE ) {
-			$file = wfLocalFile( $this );
-			if( $file->exists() ) {
-				$status = $file->move( $nt );
-				if( !$status->isOk() ) {
-					return $status->getWikiText();
-				}
-			}
-		}
-
 		# Save a null revision in the page's history notifying of the move
 		$nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
 		$nullRevId = $nullRevision->insertOn( $dbw );
+		
+		$article = new Article( $this );
+		wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, false) );
 
 		# Rename page entry
 		$dbw->update( 'page',
@@ -2696,8 +2726,7 @@ class Title {
 		);
 		$nt->resetArticleID( $oldid );
 
-		if($createRedirect || !$wgUser->isAllowed('suppressredirect'))
-		{
+		if( $createRedirect || !$wgUser->isAllowed('suppressredirect') ) {
 			# Insert redirect
 			$mwRedir = MagicWord::get( 'redirect' );
 			$redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
@@ -2709,6 +2738,8 @@ class Title {
 				'text'    => $redirectText ) );
 			$redirectRevision->insertOn( $dbw );
 			$redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
+			
+			wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false) );
 
 			# Record the just-created redirect's linking to the page
 			$dbw->insert( 'pagelinks',
@@ -2720,6 +2751,19 @@ class Title {
 		} else {
 			$this->resetArticleID( 0 );
 		}
+		
+		# Move an image if this is a file
+		if( $this->getNamespace() == NS_IMAGE ) {
+			$file = wfLocalFile( $this );
+			if( $file->exists() ) {
+				$status = $file->move( $nt );
+				if( !$status->isOk() ) {
+					$dbw->rollback();
+					return $status->getErrorsArray();
+				}
+			}
+		}
+		$dbw->commit();
 
 		# Log the move
 		$log = new LogPage( 'move' );
@@ -2731,6 +2775,7 @@ class Title {
 		# Purge old title from squid
 		# The new title, and links to the new title, are purged in Article::onArticleCreate()
 		$this->purgeSquid();
+		
 	}
 
 	/**
@@ -2849,7 +2894,7 @@ class Title {
 	  	$stack = array();
 		$parents = $this->getParentCategories();
 
-		if($parents != '') {
+		if( $parents ) {
 			foreach($parents as $parent => $current) {
 				if ( array_key_exists( $parent, $children ) ) {
 					# Circular reference
@@ -2882,26 +2927,38 @@ class Title {
 	 * Get the revision ID of the previous revision
 	 *
 	 * @param integer $revision  Revision ID. Get the revision that was before this one.
+	 * @param integer $flags, GAID_FOR_UPDATE
 	 * @return integer $oldrevision|false
 	 */
-	public function getPreviousRevisionID( $revision ) {
-		$dbr = wfGetDB( DB_SLAVE );
-		return $dbr->selectField( 'revision', 'rev_id',
-			'rev_page=' . intval( $this->getArticleId() ) .
-			' AND rev_id<' . intval( $revision ) . ' ORDER BY rev_id DESC' );
+	public function getPreviousRevisionID( $revision, $flags=0 ) {
+		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+		return $db->selectField( 'revision', 'rev_id',
+			array(
+				'rev_page' => $this->getArticleId($flags),
+				'rev_id < ' . intval( $revision )
+			),
+			__METHOD__,
+			array( 'ORDER BY' => 'rev_id DESC' )
+		);
 	}
 
 	/**
 	 * Get the revision ID of the next revision
 	 *
 	 * @param integer $revision  Revision ID. Get the revision that was after this one.
+	 * @param integer $flags, GAID_FOR_UPDATE
 	 * @return integer $oldrevision|false
 	 */
-	public function getNextRevisionID( $revision ) {
-		$dbr = wfGetDB( DB_SLAVE );
-		return $dbr->selectField( 'revision', 'rev_id',
-			'rev_page=' . intval( $this->getArticleId() ) .
-			' AND rev_id>' . intval( $revision ) . ' ORDER BY rev_id' );
+	public function getNextRevisionID( $revision, $flags=0 ) {
+		$db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+		return $db->selectField( 'revision', 'rev_id',
+			array(
+				'rev_page' => $this->getArticleId($flags),
+				'rev_id > ' . intval( $revision )
+			),
+			__METHOD__,
+			array( 'ORDER BY' => 'rev_id' )
+		);
 	}
 
 	/**
@@ -2935,6 +2992,17 @@ class Title {
 			&& $this->getDBkey() === $title->getDBkey();
 	}
 
+	/**
+	 * Callback for usort() to do title sorts by (namespace, title)
+	 */
+	static function compare( $a, $b ) {
+		if( $a->getNamespace() == $b->getNamespace() ) {
+			return strcmp( $a->getText(), $b->getText() );
+		} else {
+			return $a->getNamespace() - $b->getNamespace();
+		}
+	}
+
 	/**
 	 * Return a string representation of this title
 	 *
@@ -3111,12 +3179,25 @@ class Title {
 		return MWNamespace::isContent( $this->getNamespace() );
 	}
 
-	public function getRedirectsHere() {
+	public function getRedirectsHere( $ns = null ) {
 		$redirs = array();
-		$dbr = wfGetDB( DB_SLAVE );
-		list($page,$redirect) = $dbr->tableNamesN( 'page', 'redirect' );
-		$result = $dbr->query( "SELECT page_title, page_namespace FROM $page JOIN $redirect ON page_id = rd_from WHERE rd_title = "
-			. $dbr->addQuotes( $this->getDBKey() ) . " AND rd_namespace = " . $this->getNamespace(), __METHOD__ );
+		
+		$dbr = wfGetDB( DB_SLAVE );	
+		$where = array(
+			'rd_namespace' => $this->getNamespace(),
+			'rd_title' => $this->getDBkey(),
+			'rd_from = page_id'
+		);
+		if ( !is_null($ns) ) $where['page_namespace'] = $ns;
+		
+		$result = $dbr->select(
+			array( 'redirect', 'page' ),
+			array( 'page_namespace', 'page_title' ),
+			$where,
+			__METHOD__
+		);
+
+
 		while( $row = $dbr->fetchObject( $result ) ) {
 			$redirs[] = self::newFromRow( $row );
 		}