* @static
* @access public
*/
- function newFromText( $text, $defaultNamespace = NS_MAIN ) {
+ public static function newFromText( $text, $defaultNamespace = NS_MAIN ) {
$fname = 'Title::newFromText';
if( is_object( $text ) ) {
*/
$filteredText = Sanitizer::decodeCharReferences( $text );
- $t =& new Title();
+ $t = new Title();
$t->mDbkeyform = str_replace( ' ', '_', $filteredText );
$t->mDefaultNamespace = $defaultNamespace;
* @static
* @access public
*/
- function &makeTitle( $ns, $title ) {
- $t =& new Title();
+ public static function &makeTitle( $ns, $title ) {
+ $t = new Title();
$t->mInterwiki = '';
$t->mFragment = '';
$t->mNamespace = intval( $ns );
}
/**
- * Create a new Title frrom a namespace index and a DB key.
+ * Create a new Title from a namespace index and a DB key.
* The parameters will be checked for validity, which is a bit slower
* than makeTitle() but safer for user-provided data.
*
* @static
* @access public
*/
- function makeTitleSafe( $ns, $title ) {
+ public static function makeTitleSafe( $ns, $title ) {
$t = new Title();
$t->mDbkeyform = Title::makeName( $ns, $title );
if( $t->secureAndSplit() ) {
* @return Title the new object
* @access public
*/
- function newMainPage() {
+ public static function newMainPage() {
return Title::newFromText( wfMsgForContent( 'mainpage' ) );
}
* @static
* @access public
*/
- function newFromRedirect( $text ) {
- global $wgMwRedir;
+ public static function newFromRedirect( $text ) {
+ $mwRedir = MagicWord::get( 'redirect' );
$rt = NULL;
- if ( $wgMwRedir->matchStart( $text ) ) {
+ if ( $mwRedir->matchStart( $text ) ) {
if ( preg_match( '/\[{2}(.*?)(?:\||\]{2})/', $text, $m ) ) {
# categories are escaped using : for example one can enter:
# #REDIRECT [[:Category:Music]]. Need to remove it.
* @static
* @access public
*/
- function legalChars() {
+ public static function legalChars() {
global $wgLegalTitleChars;
return $wgLegalTitleChars;
}
* @param string $title the DB key form the title
* @return string the prefixed form of the title
*/
- /* static */ function makeName( $ns, $title ) {
+ public static function makeName( $ns, $title ) {
global $wgContLang;
$n = $wgContLang->getNsText( $ns );
return $this->userCan('edit');
}
+ /**
+ * Can $wgUser create this page?
+ * @return boolean
+ * @access public
+ */
+ function userCanCreate() {
+ return $this->userCan('create');
+ }
+
/**
* Can $wgUser move this page?
* @return boolean
* Check that the corresponding skin exists
*/
function isValidCssJsSubpage() {
- global $wgValidSkinNames;
- return( $this->isCssJsSubpage() && array_key_exists( $this->getSkinFromCssJsSubpage(), $wgValidSkinNames ) );
+ if ( $this->isCssJsSubpage() ) {
+ $skinNames = Skin::getSkinNames();
+ return array_key_exists( $this->getSkinFromCssJsSubpage(), $skinNames );
+ } else {
+ return false;
+ }
}
/**
* Trim down a .css or .js subpage title to get the corresponding skin name
* @private
*/
function moveOverExistingRedirect( &$nt, $reason = '' ) {
- global $wgUseSquid, $wgMwRedir;
+ global $wgUseSquid;
$fname = 'Title::moveOverExistingRedirect';
$comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
$linkCache->clearLink( $nt->getPrefixedDBkey() );
# Recreate the redirect, this time in the other direction.
- $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
+ $mwRedir = MagicWord::get( 'redirect' );
+ $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
$redirectArticle = new Article( $this );
$newid = $redirectArticle->insertOn( $dbw );
$redirectRevision = new Revision( array(
*/
function moveToNewTitle( &$nt, $reason = '' ) {
global $wgUseSquid;
- global $wgMwRedir;
$fname = 'MovePageForm::moveToNewTitle';
$comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
if ( $reason ) {
$linkCache->clearLink( $nt->getPrefixedDBkey() );
# Insert redirect
- $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
+ $mwRedir = MagicWord::get( 'redirect' );
+ $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
$redirectArticle = new Article( $this );
$newid = $redirectArticle->insertOn( $dbw );
$redirectRevision = new Revision( array(
if ( !$obj || 0 == $obj->page_is_redirect ) {
# Not a redirect
+ wfDebug( __METHOD__ . ": not a redirect\n" );
return false;
}
$text = Revision::getRevisionText( $obj );
# Does the redirect point to the source?
+ # Or is it a broken self-redirect, usually caused by namespace collisions?
if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $text, $m ) ) {
$redirTitle = Title::newFromText( $m[1] );
if( !is_object( $redirTitle ) ||
- $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() ) {
+ ( $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() &&
+ $redirTitle->getPrefixedDBkey() != $nt->getPrefixedDBkey() ) ) {
+ wfDebug( __METHOD__ . ": redirect points to other page\n" );
return false;
}
} else {
# Fail safe
+ wfDebug( __METHOD__ . ": failsafe\n" );
return false;
}
/**
* Get the revision ID of the previous revision
*
- * @param integer $revId Revision ID. Get the revision that was before this one.
- * @param string $timestamp The timestamp of the current revision, if known
+ * @param integer $revision Revision ID. Get the revision that was before this one.
* @return interger $oldrevision|false
*/
- function getPreviousRevisionID( $revId, $timestamp = false ) {
+ 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' );