X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTitle.php;h=8586ad762de69c2bbd606407fc663ecc55b4ff7c;hb=0818070c59eb4e8330496796b943951c01c7a573;hp=ecbb1b6331b87522eb364a33ce6c7349ff777bdb;hpb=18a6b556b3c595bd0ced99316280094e77ab4a7e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Title.php b/includes/Title.php
index ecbb1b6331..8586ad762d 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2086,7 +2086,7 @@ class Title implements LinkTarget {
 	 * May provide false positives, but should never provide a false negative.
 	 *
 	 * @param string $action Action that permission needs to be checked for
-	 * @param User $user User to check (since 1.19); $wgUser will be used if not provided.
+	 * @param User|null $user User to check (since 1.19); $wgUser will be used if not provided.
 	 * @return bool
 	 */
 	public function quickUserCan( $action, $user = null ) {
@@ -2097,7 +2097,7 @@ class Title implements LinkTarget {
 	 * Can $user perform $action on this page?
 	 *
 	 * @param string $action Action that permission needs to be checked for
-	 * @param User $user User to check (since 1.19); $wgUser will be used if not
+	 * @param User|null $user User to check (since 1.19); $wgUser will be used if not
 	 *   provided.
 	 * @param string $rigor Same format as Title::getUserPermissionsErrors()
 	 * @return bool
@@ -3139,7 +3139,7 @@ class Title implements LinkTarget {
 	 * Public for usage by LiquidThreads.
 	 *
 	 * @param array $rows Array of db result objects
-	 * @param string $oldFashionedRestrictions Comma-separated set of permission keys
+	 * @param string|null $oldFashionedRestrictions Comma-separated set of permission keys
 	 * indicating who can move or edit the page from the page table, (pre 1.10) rows.
 	 * Edit and move sections are separated by a colon
 	 * Example: "edit=autoconfirmed,sysop:move=sysop"
@@ -3211,7 +3211,7 @@ class Title implements LinkTarget {
 	/**
 	 * Load restrictions from the page_restrictions table
 	 *
-	 * @param string $oldFashionedRestrictions Comma-separated set of permission keys
+	 * @param string|null $oldFashionedRestrictions Comma-separated set of permission keys
 	 * indicating who can move or edit the page from the page table, (pre 1.10) rows.
 	 * Edit and move sections are separated by a colon
 	 * Example: "edit=autoconfirmed,sysop:move=sysop"
@@ -4681,7 +4681,7 @@ class Title implements LinkTarget {
 	/**
 	 * Updates page_touched for this page; called from LinksUpdate.php
 	 *
-	 * @param string $purgeTime [optional] TS_MW timestamp
+	 * @param string|null $purgeTime [optional] TS_MW timestamp
 	 * @return bool True if the update succeeded
 	 */
 	public function invalidateCache( $purgeTime = null ) {
@@ -4752,7 +4752,7 @@ class Title implements LinkTarget {
 	/**
 	 * Get the timestamp when this page was updated since the user last saw it.
 	 *
-	 * @param User $user
+	 * @param User|null $user
 	 * @return string|null
 	 */
 	public function getNotificationTimestamp( $user = null ) {
@@ -4983,7 +4983,7 @@ class Title implements LinkTarget {
 			$langObj = $contentHandler->getPageLanguage( $this );
 			$this->mPageLanguage = [ $langObj->getCode(), $wgLanguageCode ];
 		} else {
-			$langObj = wfGetLangObj( $this->mPageLanguage[0] );
+			$langObj = Language::factory( $this->mPageLanguage[0] );
 		}
 
 		return $langObj;