Index: MediaWiki/branches/1.11/includes/WatchedItem.php
===================================================================
--- MediaWiki/branches/1.11/includes/WatchedItem.php	(revision 1280)
+++ MediaWiki/branches/1.11/includes/WatchedItem.php	(revision 1281)
@@ -15,8 +15,8 @@
 	 * @access private
 	 */
-	function &fromUserTitle( &$user, &$title ) {
+	static function fromUserTitle( $user, $title ) {
 		$wl = new WatchedItem;
-		$wl->mUser =& $user;
-		$wl->mTitle =& $title;
+		$wl->mUser = $user;
+		$wl->mTitle = $title;
 		$wl->id = $user->getId();
 # Patch (also) for email notification on page changes T.Gries/M.Arndt 11.09.2004
@@ -117,16 +117,11 @@
 	 * @param Title $ot Page title to duplicate entries from, if present
 	 * @param Title $nt Page title to add watches on
-	 * @static
 	 */
-	function duplicateEntries( $ot, $nt ) {
+	static function duplicateEntries( $ot, $nt ) {
 		WatchedItem::doDuplicateEntries( $ot->getSubjectPage(), $nt->getSubjectPage() );
 		WatchedItem::doDuplicateEntries( $ot->getTalkPage(), $nt->getTalkPage() );
 	}
 
-	/**
-	 * @static
-	 * @access private
-	 */
-	function doDuplicateEntries( $ot, $nt ) {
+	private static function doDuplicateEntries( $ot, $nt ) {
 		$fname = "WatchedItem::duplicateEntries";
 		$oldnamespace = $ot->getNamespace();
@@ -166,3 +161,3 @@
 }
 
-?>
+