<?php
/**
- * $Id$
* See title.doc
*
* @package MediaWiki
$wgTitleInterwikiCache = array();
define ( 'GAID_FOR_UPDATE', 1 );
+# Title::newFromTitle maintains a cache to avoid
+# expensive re-normalization of commonly used titles.
+# On a batch operation this can become a memory leak
+# if not bounded. After hitting this many titles,
+# reset the cache.
+define( 'MW_TITLECACHE_MAX', 1000 );
+
/**
* Title class
* - Represents a title, which may contain an interwiki designation or namespace
$this->mNamespace = 0;
$this->mRestrictionsLoaded = false;
$this->mRestrictions = array();
- $this->mDefaultNamespace = 0;
+ # Dont change the following, NS_MAIN is hardcoded in several place
+ # See bug #696
+ $this->mDefaultNamespace = NS_MAIN;
}
/**
* @static
* @access public
*/
- /* static */ function newFromText( $text, $defaultNamespace = 0 ) {
+ /* static */ function &newFromText( $text, $defaultNamespace = 0 ) {
$fname = 'Title::newFromText';
wfProfileIn( $fname );
-
- if( is_object( $text ) ) {
- wfDebugDieBacktrace( 'Called with object instead of string.' );
+
+ /**
+ * Wiki pages often contain multiple links to the same page.
+ * Title normalization and parsing can become expensive on
+ * pages with many links, so we can save a little time by
+ * caching them.
+ *
+ * In theory these are value objects and won't get changed...
+ */
+ static $titleCache = array();
+ if( $defaultNamespace == 0 && isset( $titleCache[$text] ) ) {
+ wfProfileOut( $fname );
+ return $titleCache[$text];
}
+
+ /**
+ * Convert things like é into real text...
+ */
global $wgInputEncoding;
- $text = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
+ $filteredText = do_html_entity_decode( $text, ENT_COMPAT, $wgInputEncoding );
- $text = wfMungeToUtf8( $text );
-
+ /**
+ * Convert things like ā or 〗 into real text...
+ * WARNING: Not friendly to internal links on a latin-1 wiki.
+ */
+ $filteredText = wfMungeToUtf8( $filteredText );
# What was this for? TS 2004-03-03
# $text = urldecode( $text );
- $t = new Title();
- $t->mDbkeyform = str_replace( ' ', '_', $text );
+ $t =& new Title();
+ $t->mDbkeyform = str_replace( ' ', '_', $filteredText );
$t->mDefaultNamespace = $defaultNamespace;
- wfProfileOut( $fname );
- if ( !is_object( $t ) ) {
- var_dump( debug_backtrace() );
- }
if( $t->secureAndSplit() ) {
+ if( $defaultNamespace == 0 ) {
+ if( count( $titleCache ) >= MW_TITLECACHE_MAX ) {
+ # Avoid memory leaks on mass operations...
+ $titleCache = array();
+ }
+ $titleCache[$text] =& $t;
+ }
+ wfProfileOut( $fname );
return $t;
} else {
+ wfProfileOut( $fname );
return NULL;
}
}
/**
* Create a new Title from an article ID
- * @todo This is inefficiently implemented, the cur row is requested
+ * @todo This is inefficiently implemented, the page row is requested
* but not used for anything else
- * @param int $id the cur_id corresponding to the Title to create
+ * @param int $id the page_id corresponding to the Title to create
* @return Title the new object, or NULL on an error
* @access public
*/
/* static */ function newFromID( $id ) {
$fname = 'Title::newFromID';
$dbr =& wfGetDB( DB_SLAVE );
- $row = $dbr->selectRow( 'cur', array( 'cur_namespace', 'cur_title' ),
- array( 'cur_id' => $id ), $fname );
+ $row = $dbr->selectRow( 'page', array( 'page_namespace', 'page_title' ),
+ array( 'page_id' => $id ), $fname );
if ( $row !== false ) {
- $title = Title::makeTitle( $row->cur_namespace, $row->cur_title );
+ $title = Title::makeTitle( $row->page_namespace, $row->page_title );
} else {
$title = NULL;
}
* Create a new Title from a namespace index and a DB key.
* It's assumed that $ns and $title are *valid*, for instance when
* they came directly from the database or a special page name.
+ * For convenience, spaces are converted to underscores so that
+ * eg user_text fields can be used directly.
+ *
* @param int $ns the namespace of the article
* @param string $title the unprefixed database key form
* @return Title the new object
$t->mInterwiki = '';
$t->mFragment = '';
$t->mNamespace = IntVal( $ns );
- $t->mDbkeyform = $title;
+ $t->mDbkeyform = str_replace( ' ', '_', $title );
$t->mArticleID = ( $ns >= 0 ) ? -1 : 0;
- $t->mUrlform = wfUrlencode( $title );
+ $t->mUrlform = wfUrlencode( $t->mDbkeyform );
$t->mTextform = str_replace( '_', ' ', $title );
return $t;
}
/**
* Get the prefixed DB key associated with an ID
- * @param int $id the cur_id of the article
+ * @param int $id the page_id of the article
* @return Title an object representing the article, or NULL
* if no such article was found
* @static
$fname = 'Title::nameOf';
$dbr =& wfGetDB( DB_SLAVE );
- $s = $dbr->selectRow( 'cur', array( 'cur_namespace','cur_title' ), array( 'cur_id' => $id ), $fname );
+ $s = $dbr->selectRow( 'page', array( 'page_namespace','page_title' ), array( 'page_id' => $id ), $fname );
if ( $s === false ) { return NULL; }
- $n = Title::makeName( $s->cur_namespace, $s->cur_title );
+ $n = Title::makeName( $s->page_namespace, $s->page_title );
return $n;
}
$t = preg_replace( "/\\s+/", ' ', $t );
- if ( $ns == Namespace::getImage() ) {
+ if ( $ns == NS_IMAGE ) {
$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t );
}
return trim( $t );
function getInterwikiLink( $key ) {
global $wgMemc, $wgDBname, $wgInterwikiExpiry, $wgTitleInterwikiCache;
$fname = 'Title::getInterwikiLink';
+
+ wfProfileIn( $fname );
+
$k = $wgDBname.':interwiki:'.$key;
-
- if( array_key_exists( $k, $wgTitleInterwikiCache ) )
+ if( array_key_exists( $k, $wgTitleInterwikiCache ) ) {
+ wfProfileOut( $fname );
return $wgTitleInterwikiCache[$k]->iw_url;
+ }
$s = $wgMemc->get( $k );
# Ignore old keys with no iw_local
if( $s && isset( $s->iw_local ) ) {
$wgTitleInterwikiCache[$k] = $s;
+ wfProfileOut( $fname );
return $s->iw_url;
}
+
$dbr =& wfGetDB( DB_SLAVE );
- $res = $dbr->select( 'interwiki', array( 'iw_url', 'iw_local' ), array( 'iw_prefix' => $key ), $fname );
- if(!$res) return '';
+ $res = $dbr->select( 'interwiki',
+ array( 'iw_url', 'iw_local' ),
+ array( 'iw_prefix' => $key ), $fname );
+ if( !$res ) {
+ wfProfileOut( $fname );
+ return '';
+ }
$s = $dbr->fetchObject( $res );
- if(!$s) {
+ if( !$s ) {
# Cache non-existence: create a blank object and save it to memcached
$s = (object)false;
$s->iw_url = '';
}
$wgMemc->set( $k, $s, $wgInterwikiExpiry );
$wgTitleInterwikiCache[$k] = $s;
+
+ wfProfileOut( $fname );
return $s->iw_url;
}
}
/**
- * Update the cur_touched field for an array of title objects
+ * Update the page_touched field for an array of title objects
* @todo Inefficient unless the IDs are already loaded into the
* link cache
* @param array $titles an array of Title objects to be touched
if ( $timestamp == '' ) {
$timestamp = $dbw->timestamp();
}
- $cur = $dbw->tableName( 'cur' );
- $sql = "UPDATE $cur SET cur_touched='{$timestamp}' WHERE cur_id IN (";
+ $page = $dbw->tableName( 'page' );
+ $sql = "UPDATE $page SET page_touched='{$timestamp}' WHERE page_id IN (";
$first = true;
foreach ( $titles as $title ) {
* @access public
*/
function getNamespace() { return $this->mNamespace; }
- /**
- * Set the namespace index
- * @param int $n the namespace index, one of the NS_xxxx constants
- * @access public
- */
- function setNamespace( $n ) { $this->mNamespace = IntVal( $n ); }
/**
* Get the interwiki prefix (or null string)
* @return string
$s = wfUrlencode ( $s ) ;
# Cleaning up URL to make it look nice -- is this safe?
- $s = preg_replace( '/%3[Aa]/', ':', $s );
- $s = preg_replace( '/%2[Ff]/', '/', $s );
$s = str_replace( '%28', '(', $s );
$s = str_replace( '%29', ')', $s );
}
}
- /**
- * @deprecated
- */
- function getURL() {
- die( 'Call to obsolete obsolete function Title::getURL()' );
- }
-
/**
* Get a URL with no fragment or server name
* @param string $query an optional query string; if not specified,
if ( $query == '-' ) {
$query = '';
}
- if ( $wgScript != '' ) {
- $url = "{$wgScript}?title={$dbkey}&{$query}";
- } else {
- # Top level wiki
- $url = "/{$dbkey}?{$query}";
- }
+ $url = "{$wgScript}?title={$dbkey}&{$query}";
}
return $url;
}
/**
* Does the title correspond to a protected article?
+ * @param string $what the action the page is protected from,
+ * by default checks move and edit
* @return boolean
* @access public
*/
- function isProtected() {
+ function isProtected($action = '') {
if ( -1 == $this->mNamespace ) { return true; }
- $a = $this->getRestrictions();
- if ( in_array( 'sysop', $a ) ) { return true; }
- return false;
- }
-
- /**
- * Is the page a log page, i.e. one where the history is messed up by
- * LogPage.php? This used to be used for suppressing diff links in
- * recent changes, but now that's done by setting a flag in the
- * recentchanges table. Hence, this probably is no longer used.
- *
- * @deprecated
- * @access public
- */
- function isLog() {
- if ( $this->mNamespace != Namespace::getWikipedia() ) {
- return false;
- }
- if ( ( 0 == strcmp( wfMsg( 'uploadlogpage' ), $this->mDbkeyform ) ) ||
- ( 0 == strcmp( wfMsg( 'dellogpage' ), $this->mDbkeyform ) ) ) {
- return true;
- }
+ if($action == 'edit' || $action == '') {
+ $a = $this->getRestrictions("edit");
+ if ( in_array( 'sysop', $a ) ) { return true; }
+ }
+ if($action == 'move' || $action == '') {
+ $a = $this->getRestrictions("move");
+ if ( in_array( 'sysop', $a ) ) { return true; }
+ }
return false;
}
return $wgUser->isWatched( $this );
}
- /**
- * Can $wgUser edit this page?
+ /**
+ * Is $wgUser perform $action this page?
+ * @param string $action action that permission needs to be checked for
* @return boolean
- * @access public
- */
- function userCanEdit() {
+ * @access private
+ */
+ function userCan($action) {
+ $fname = 'Title::userCanEdit';
+ wfProfileIn( $fname );
+
global $wgUser;
if( NS_SPECIAL == $this->mNamespace ) {
+ wfProfileOut( $fname );
return false;
}
if( NS_MEDIAWIKI == $this->mNamespace &&
!$wgUser->isAllowed('editinterface') ) {
+ wfProfileOut( $fname );
return false;
}
if( $this->mDbkeyform == '_' ) {
# FIXME: Is this necessary? Shouldn't be allowed anyway...
+ wfProfileOut( $fname );
return false;
}
if ( NS_MEDIAWIKI == $this->mNamespace
&& preg_match("/\\.(css|js)$/", $this->mTextform )
&& !$wgUser->isAllowed('editinterface') ) {
+ wfProfileOut( $fname );
return false;
}
&& preg_match("/\\.(css|js)$/", $this->mTextform )
&& !$wgUser->isAllowed('editinterface')
&& !preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) ) {
+ wfProfileOut( $fname );
return false;
}
- foreach( $this->getRestrictions() as $right ) {
+ foreach( $this->getRestrictions($action) as $right ) {
if( '' != $right && !$wgUser->isAllowed( $right ) ) {
+ wfProfileOut( $fname );
return false;
}
}
+ wfProfileOut( $fname );
return true;
}
+ /**
+ * Can $wgUser edit this page?
+ * @return boolean
+ * @access public
+ */
+ function userCanEdit() {
+ return $this->userCan('edit');
+ }
+
+ /**
+ * Can $wgUser move this page?
+ * @return boolean
+ * @access public
+ */
+ function userCanMove() {
+ return $this->userCan('move');
+ }
+
/**
* Can $wgUser read this page?
* @return boolean
* @access public
*/
function isCssJsSubpage() {
- return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.(css|js)$/", $this->mTextform ) );
+ return ( NS_USER == $this->mNamespace and preg_match("/\\.(css|js)$/", $this->mTextform ) );
}
/**
* Is this a .css subpage of a user page?
* @access public
*/
function isCssSubpage() {
- return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.css$/", $this->mTextform ) );
+ return ( NS_USER == $this->mNamespace and preg_match("/\\.css$/", $this->mTextform ) );
}
/**
* Is this a .js subpage of a user page?
* @access public
*/
function isJsSubpage() {
- return ( Namespace::getUser() == $this->mNamespace and preg_match("/\\.js$/", $this->mTextform ) );
+ return ( NS_USER == $this->mNamespace and preg_match("/\\.js$/", $this->mTextform ) );
}
/**
* Protect css/js subpages of user pages: can $wgUser edit
return ( $wgUser->isAllowed('editinterface') or preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
}
+ /**
+ * Loads a string into mRestrictions array
+ * @param string $res restrictions in string format
+ * @access public
+ */
+ function loadRestrictions( $res ) {
+ foreach( explode( ':', trim( $res ) ) as $restrict ) {
+ $temp = explode( '=', trim( $restrict ) );
+ if(count($temp) == 1) {
+ // old format should be treated as edit/move restriction
+ $this->mRestrictions["edit"] = explode( ',', trim( $temp[0] ) );
+ $this->mRestrictions["move"] = explode( ',', trim( $temp[0] ) );
+ } else {
+ $this->mRestrictions[$temp[0]] = explode( ',', trim( $temp[1] ) );
+ }
+ }
+ $this->mRestrictionsLoaded = true;
+ }
+
/**
* Accessor/initialisation for mRestrictions
+ * @param string $action action that permission needs to be checked for
* @return array the array of groups allowed to edit this article
* @access public
*/
- function getRestrictions() {
+ function getRestrictions($action) {
$id = $this->getArticleID();
if ( 0 == $id ) { return array(); }
if ( ! $this->mRestrictionsLoaded ) {
$dbr =& wfGetDB( DB_SLAVE );
- $res = $dbr->selectField( 'cur', 'cur_restrictions', 'cur_id='.$id );
- $this->mRestrictions = explode( ',', trim( $res ) );
- $this->mRestrictionsLoaded = true;
+ $res = $dbr->selectField( 'page', 'page_restrictions', 'page_id='.$id );
+ $this->loadRestrictions( $res );
}
- return $this->mRestrictions;
+ if( isset( $this->mRestrictions[$action] ) ) {
+ return $this->mRestrictions[$action];
+ }
+ return array();
}
/**
* keys in the "bad links" section of $wgLinkCache.
*
* - This is called from Article::insertNewArticle() to allow
- * loading of the new cur_id. It's also called from
+ * loading of the new page_id. It's also called from
* Article::doDeleteArticle()
*
* @param int $newid the new Article ID
}
/**
- * Updates cur_touched for this page; called from LinksUpdate.php
+ * Updates page_touched for this page; called from LinksUpdate.php
* @return bool true if the update succeded
* @access public
*/
function invalidateCache() {
$now = wfTimestampNow();
$dbw =& wfGetDB( DB_MASTER );
- $success = $dbw->update( 'cur',
+ $success = $dbw->update( 'page',
array( /* SET */
- 'cur_touched' => $dbw->timestamp()
+ 'page_touched' => $dbw->timestamp()
), array( /* WHERE */
- 'cur_namespace' => $this->getNamespace() ,
- 'cur_title' => $this->getDBkey()
+ 'page_namespace' => $this->getNamespace() ,
+ 'page_title' => $this->getDBkey()
), 'Title::invalidateCache'
);
return $success;
* @return bool true on success
* @access private
*/
- /* private */ function secureAndSplit()
- {
+ /* private */ function secureAndSplit() {
global $wgContLang, $wgLocalInterwiki, $wgCapitalLinks;
$fname = 'Title::secureAndSplit';
wfProfileIn( $fname );
- static $imgpre = false;
- static $rxTc = false;
-
# Initialisation
- if ( $imgpre === false ) {
- $imgpre = ':' . $wgContLang->getNsText( Namespace::getImage() ) . ':';
+ static $rxTc = false;
+ if( !$rxTc ) {
# % is needed as well
- $rxTc = '/[^' . Title::legalChars() . ']|%[0-9A-Fa-f]{2}/';
+ $rxTc = '/[^' . Title::legalChars() . ']|%[0-9A-Fa-f]{2}/S';
}
$this->mInterwiki = $this->mFragment = '';
# Clean up whitespace
#
- $t = preg_replace( "/[\\s_]+/", '_', $this->mDbkeyform );
- $t = preg_replace( '/^_*(.*?)_*$/', '$1', $t );
+ $t = preg_replace( '/[ _]+/', '_', $this->mDbkeyform );
+ $t = trim( $t, '_' );
if ( '' == $t ) {
wfProfileOut( $fname );
}
global $wgUseLatin1;
- if( !$wgUseLatin1 && false !== strpos( $t, UTF8_REPLACEMENT ) ) {
+ if( !$wgUseLatin1 && false !== strpos( $t, UTF8_REPLACEMENT ) ) {
# Contained illegal UTF-8 sequences or forbidden Unicode chars.
wfProfileOut( $fname );
return false;
}
$this->mDbkeyform = $t;
- $done = false;
-
- # :Image: namespace
- if ( 0 == strncasecmp( $imgpre, $t, strlen( $imgpre ) ) ) {
- $t = substr( $t, 1 );
- }
# Initial colon indicating main namespace
if ( ':' == $t{0} ) {
$this->mNamespace = NS_MAIN;
} else {
# Namespace or interwiki prefix
- if ( preg_match( "/^(.+?)_*:_*(.*)$/", $t, $m ) ) {
- #$p = strtolower( $m[1] );
- $p = $m[1];
- $lowerNs = strtolower( $p );
- if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
- # Canonical namespace
- $t = $m[2];
- $this->mNamespace = $ns;
- } elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
- # Ordinary namespace
- $t = $m[2];
- $this->mNamespace = $ns;
- } elseif ( $this->getInterwikiLink( $p ) ) {
- # Interwiki link
- $t = $m[2];
- $this->mInterwiki = $p;
-
- if ( !preg_match( "/^([A-Za-z0-9_\\x80-\\xff]+):(.*)$/", $t, $m ) ) {
- $done = true;
- } elseif($this->mInterwiki != $wgLocalInterwiki) {
- $done = true;
+ $firstPass = true;
+ do {
+ if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $t, $m ) ) {
+ $p = $m[1];
+ $lowerNs = strtolower( $p );
+ if ( $ns = Namespace::getCanonicalIndex( $lowerNs ) ) {
+ # Canonical namespace
+ $t = $m[2];
+ $this->mNamespace = $ns;
+ } elseif ( $ns = $wgContLang->getNsIndex( $lowerNs )) {
+ # Ordinary namespace
+ $t = $m[2];
+ $this->mNamespace = $ns;
+ } elseif( $this->getInterwikiLink( $p ) ) {
+ if( !$firstPass ) {
+ # Can't make a local interwiki link to an interwiki link.
+ # That's just crazy!
+ wfProfileOut( $fname );
+ return false;
+ }
+
+ # Interwiki link
+ $t = $m[2];
+ $this->mInterwiki = $p;
+
+ # Redundant interwiki prefix to the local wiki
+ if ( 0 == strcasecmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
+ if( $t == '' ) {
+ # Can't have an empty self-link
+ wfProfileOut( $fname );
+ return false;
+ }
+ $this->mInterwiki = '';
+ $firstPass = false;
+ # Do another namespace split...
+ continue;
+ }
}
+ # If there's no recognized interwiki or namespace,
+ # then let the colon expression be part of the title.
}
- }
+ break;
+ } while( true );
$r = $t;
}
- # Redundant interwiki prefix to the local wiki
- if ( 0 == strcmp( $this->mInterwiki, $wgLocalInterwiki ) ) {
- $this->mInterwiki = '';
- }
# We already know that some pages won't be in the database!
#
if ( '' != $this->mInterwiki || -1 == $this->mNamespace ) {
return false;
}
- # "." and ".." conflict with the directories of those namesa
+ /**
+ * Pages with "/./" or "/../" appearing in the URLs will
+ * often be unreachable due to the way web browsers deal
+ * with 'relative' URLs. Forbid them explicitly.
+ */
if ( strpos( $r, '.' ) !== false &&
( $r === '.' || $r === '..' ||
strpos( $r, './' ) === 0 ||
}
# We shouldn't need to query the DB for the size.
- #$maxSize = $dbr->textFieldSize( 'cur', 'cur_title' );
+ #$maxSize = $dbr->textFieldSize( 'page', 'page_title' );
if ( strlen( $r ) > 255 ) {
+ wfProfileOut( $fname );
return false;
}
- # Initial capital letter
+ /**
+ * Normally, all wiki links are forced to have
+ * an initial capital letter so [[foo]] and [[Foo]]
+ * point to the same place.
+ *
+ * Don't force it for interwikis, since the other
+ * site might be case-sensitive.
+ */
if( $wgCapitalLinks && $this->mInterwiki == '') {
$t = $wgContLang->ucfirst( $r );
} else {
$t = $r;
}
+ /**
+ * Can't make a link to a namespace alone...
+ * "empty" local links can only be self-links
+ * with a fragment identifier.
+ */
+ if( $t == '' &&
+ $this->mInterwiki == '' &&
+ $this->mNamespace != NS_MAIN ) {
+ wfProfileOut( $fname );
+ return false;
+ }
+
# Fill fields
$this->mDbkeyform = $t;
$this->mUrlform = wfUrlencode( $t );
} else {
$db =& wfGetDB( DB_SLAVE );
}
- $cur = $db->tableName( 'cur' );
+ $page = $db->tableName( 'page' );
$links = $db->tableName( 'links' );
- $sql = "SELECT cur_namespace,cur_title,cur_id FROM $cur,$links WHERE l_from=cur_id AND l_to={$id} $options";
+ $sql = "SELECT page_namespace,page_title,page_id FROM $page,$links WHERE l_from=page_id AND l_to={$id} $options";
$res = $db->query( $sql, 'Title::getLinksTo' );
$retVal = array();
if ( $db->numRows( $res ) ) {
while ( $row = $db->fetchObject( $res ) ) {
- if ( $titleObj = Title::makeTitle( $row->cur_namespace, $row->cur_title ) ) {
- $wgLinkCache->addGoodLink( $row->cur_id, $titleObj->getPrefixedDBkey() );
+ if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
+ $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() );
$retVal[] = $titleObj;
}
}
} else {
$db =& wfGetDB( DB_SLAVE );
}
- $cur = $db->tableName( 'cur' );
+ $page = $db->tableName( 'page' );
$brokenlinks = $db->tableName( 'brokenlinks' );
$encTitle = $db->strencode( $this->getPrefixedDBkey() );
- $sql = "SELECT cur_namespace,cur_title,cur_id FROM $brokenlinks,$cur " .
- "WHERE bl_from=cur_id AND bl_to='$encTitle' $options";
+ $sql = "SELECT page_namespace,page_title,page_id FROM $brokenlinks,$page " .
+ "WHERE bl_from=page_id AND bl_to='$encTitle' $options";
$res = $db->query( $sql, "Title::getBrokenLinksTo" );
$retVal = array();
if ( $db->numRows( $res ) ) {
while ( $row = $db->fetchObject( $res ) ) {
- $titleObj = Title::makeTitle( $row->cur_namespace, $row->cur_title );
- $wgLinkCache->addGoodLink( $row->cur_id, $titleObj->getPrefixedDBkey() );
+ $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title );
+ $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() );
$retVal[] = $titleObj;
}
}
return 'badarticleerror';
}
- if ( $auth && ( !$this->userCanEdit() || !$nt->userCanEdit() ) ) {
+ if ( $auth && (
+ !$this->userCanEdit() || !$nt->userCanEdit() ||
+ !$this->userCanMove() || !$nt->userCanMove() ) ) {
return 'protectedpage';
}
# Fixing category links (those without piped 'alternate' names) to be sorted under the new title
$dbw =& wfGetDB( DB_MASTER );
- $sql = "UPDATE categorylinks SET cl_sortkey=" . $dbw->addQuotes( $nt->getPrefixedText() ) .
+ $categorylinks = $dbw->tableName( 'categorylinks' );
+ $sql = "UPDATE $categorylinks SET cl_sortkey=" . $dbw->addQuotes( $nt->getPrefixedText() ) .
" WHERE cl_from=" . $dbw->addQuotes( $this->getArticleID() ) .
" AND cl_sortkey=" . $dbw->addQuotes( $this->getPrefixedText() );
$dbw->query( $sql, 'SpecialMovepage::doSubmit' );
$u = new SearchUpdate( $newid, $this->getPrefixedDBkey(), '' );
$u->doUpdate();
+ wfRunHooks( 'TitleMoveComplete', $this, $nt, $wgUser, $oldid, $newid );
return true;
}
/* private */ function moveOverExistingRedirect( &$nt ) {
global $wgUser, $wgLinkCache, $wgUseSquid, $wgMwRedir;
$fname = 'Title::moveOverExistingRedirect';
- $comment = wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+ $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
$now = wfTimestampNow();
$won = wfInvertTimestamp( $now );
+ $rand = wfRandom();
$newid = $nt->getArticleID();
$oldid = $this->getArticleID();
$dbw =& wfGetDB( DB_MASTER );
$links = $dbw->tableName( 'links' );
+ # Delete the old redirect. We don't save it to history since
+ # by definition if we've got here it's rather uninteresting.
+ # We have to remove it so that the next step doesn't trigger
+ # a conflict on the unique namespace+title index...
+ $dbw->delete( 'page', array( 'page_id' => $newid ), $fname );
+
# Change the name of the target page:
- $dbw->update( 'cur',
+ $dbw->update( 'page',
/* SET */ array(
- 'cur_touched' => $dbw->timestamp($now),
- 'cur_namespace' => $nt->getNamespace(),
- 'cur_title' => $nt->getDBkey()
+ 'page_touched' => $dbw->timestamp($now),
+ 'page_namespace' => $nt->getNamespace(),
+ 'page_title' => $nt->getDBkey()
),
- /* WHERE */ array( 'cur_id' => $oldid ),
+ /* WHERE */ array( 'page_id' => $oldid ),
$fname
);
$wgLinkCache->clearLink( $nt->getPrefixedDBkey() );
- # Repurpose the old redirect. We don't save it to history since
- # by definition if we've got here it's rather uninteresting.
-
+ # Recreate the redirect, this time in the other direction.
$redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
- $dbw->update( 'cur',
- /* SET */ array(
- 'cur_touched' => $dbw->timestamp($now),
- 'cur_timestamp' => $dbw->timestamp($now),
- 'inverse_timestamp' => $won,
- 'cur_namespace' => $this->getNamespace(),
- 'cur_title' => $this->getDBkey(),
- 'cur_text' => $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n",
- 'cur_comment' => $comment,
- 'cur_user' => $wgUser->getID(),
- 'cur_minor_edit' => 0,
- 'cur_counter' => 0,
- 'cur_restrictions' => '',
- 'cur_user_text' => $wgUser->getName(),
- 'cur_is_redirect' => 1,
- 'cur_is_new' => 1
- ),
- /* WHERE */ array( 'cur_id' => $newid ),
- $fname
+ $dbw->insert( 'revision', array(
+ 'rev_id' => $dbw->nextSequenceValue('rev_rev_id_seq'),
+ 'rev_comment' => $comment,
+ 'rev_user' => $wgUser->getID(),
+ 'rev_user_text' => $wgUser->getName(),
+ 'rev_timestamp' => $now,
+ 'inverse_timestamp' => $won ), $fname
);
-
- $wgLinkCache->clearLink( $this->getPrefixedDBkey() );
-
- # Fix the redundant names for the past revisions of the target page.
- # The redirect should have no old revisions.
- $dbw->update(
- /* table */ 'old',
- /* SET */ array(
- 'old_namespace' => $nt->getNamespace(),
- 'old_title' => $nt->getDBkey(),
- ),
- /* WHERE */ array(
- 'old_namespace' => $this->getNamespace(),
- 'old_title' => $this->getDBkey(),
- ),
- $fname
+ $revid = $dbw->insertId();
+ $dbw->insert( 'text', array(
+ 'old_id' => $revid,
+ 'old_flags' => '',
+ 'old_text' => $redirectText,
+ ), $fname
);
+ $dbw->insert( 'page', array(
+ 'page_id' => $dbw->nextSequenceValue('page_page_id_seq'),
+ 'page_namespace' => $this->getNamespace(),
+ 'page_title' => $this->getDBkey(),
+ 'page_touched' => $now,
+ 'page_is_redirect' => 1,
+ 'page_random' => $rand,
+ 'page_is_new' => 1,
+ 'page_latest' => $revid), $fname
+ );
+ $newid = $dbw->insertId();
+ $wgLinkCache->clearLink( $this->getPrefixedDBkey() );
RecentChange::notifyMoveOverRedirect( $now, $this, $nt, $wgUser, $comment );
*/
/* private */ function moveToNewTitle( &$nt, &$newid ) {
global $wgUser, $wgLinkCache, $wgUseSquid;
+ global $wgMwRedir;
$fname = 'MovePageForm::moveToNewTitle';
- $comment = wfMsg( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+ $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
$newid = $nt->getArticleID();
$oldid = $this->getArticleID();
$rand = wfRandom();
# Rename cur entry
- $dbw->update( 'cur',
+ $dbw->update( 'page',
/* SET */ array(
- 'cur_touched' => $now,
- 'cur_namespace' => $nt->getNamespace(),
- 'cur_title' => $nt->getDBkey()
+ 'page_touched' => $now,
+ 'page_namespace' => $nt->getNamespace(),
+ 'page_title' => $nt->getDBkey()
),
- /* WHERE */ array( 'cur_id' => $oldid ),
+ /* WHERE */ array( 'page_id' => $oldid ),
$fname
);
$wgLinkCache->clearLink( $nt->getPrefixedDBkey() );
# Insert redirect
- $dbw->insert( 'cur', array(
- 'cur_id' => $dbw->nextSequenceValue('cur_cur_id_seq'),
- 'cur_namespace' => $this->getNamespace(),
- 'cur_title' => $this->getDBkey(),
- 'cur_comment' => $comment,
- 'cur_user' => $wgUser->getID(),
- 'cur_user_text' => $wgUser->getName(),
- 'cur_timestamp' => $now,
- 'inverse_timestamp' => $won,
- 'cur_touched' => $now,
- 'cur_is_redirect' => 1,
- 'cur_random' => $rand,
- 'cur_is_new' => 1,
- 'cur_text' => "#REDIRECT [[" . $nt->getPrefixedText() . "]]\n" ), $fname
+ $redirectText = $wgMwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
+ $dbw->insert( 'revision', array(
+ 'rev_id' => $dbw->nextSequenceValue('rev_rev_id_seq'),
+ 'rev_comment' => $comment,
+ 'rev_user' => $wgUser->getID(),
+ 'rev_user_text' => $wgUser->getName(),
+ 'rev_timestamp' => $now,
+ 'inverse_timestamp' => $won ), $fname
+ );
+ $revid = $dbw->insertId();
+ $dbw->insert( 'text', array(
+ 'old_id' => $revid,
+ 'old_flags' => '',
+ 'old_text' => $redirectText
+ ), $fname
+ );
+ $dbw->insert( 'page', array(
+ 'page_id' => $dbw->nextSequenceValue('page_page_id_seq'),
+ 'page_namespace' => $this->getNamespace(),
+ 'page_title' => $this->getDBkey(),
+ 'page_touched' => $now,
+ 'page_is_redirect' => 1,
+ 'page_random' => $rand,
+ 'page_is_new' => 1,
+ 'page_latest' => $revid), $fname
);
$newid = $dbw->insertId();
$wgLinkCache->clearLink( $this->getPrefixedDBkey() );
- # Rename old entries
- $dbw->update(
- /* table */ 'old',
- /* SET */ array(
- 'old_namespace' => $nt->getNamespace(),
- 'old_title' => $nt->getDBkey()
- ),
- /* WHERE */ array(
- 'old_namespace' => $this->getNamespace(),
- 'old_title' => $this->getDBkey()
- ), $fname
- );
-
# Record in RC
RecentChange::notifyMoveToNew( $now, $this, $nt, $wgUser, $comment );
* @access public
*/
function isValidMoveTarget( $nt ) {
+
$fname = 'Title::isValidMoveTarget';
$dbw =& wfGetDB( DB_MASTER );
# Is it a redirect?
$id = $nt->getArticleID();
- $obj = $dbw->selectRow( 'cur', array( 'cur_is_redirect','cur_text' ),
- array( 'cur_id' => $id ), $fname, 'FOR UPDATE' );
+ $obj = $dbw->selectRow( array( 'page', 'text') ,
+ array( 'page_is_redirect','old_text' ),
+ array( 'page_id' => $id, 'page_latest=old_id' ),
+ $fname, 'FOR UPDATE' );
- if ( !$obj || 0 == $obj->cur_is_redirect ) {
+ if ( !$obj || 0 == $obj->page_is_redirect ) {
# Not a redirect
return false;
}
# Does the redirect point to the source?
- if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $obj->cur_text, $m ) ) {
+ if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $obj->old_text, $m ) ) {
$redirTitle = Title::newFromText( $m[1] );
if( !is_object( $redirTitle ) ||
$redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() ) {
}
# Does the article have a history?
- $row = $dbw->selectRow( 'old', array( 'old_id' ),
- array(
- 'old_namespace' => $nt->getNamespace(),
- 'old_title' => $nt->getDBkey()
+ $row = $dbw->selectRow( array( 'page', 'revision'),
+ array( 'rev_id' ),
+ array( 'page_namespace' => $nt->getNamespace(),
+ 'page_title' => $nt->getDBkey(),
+ 'page_id=rev_page AND page_latest != rev_id'
), $fname, 'FOR UPDATE'
);
$dbw =& wfGetDB( DB_MASTER );
$now = wfTimestampNow();
$won = wfInvertTimestamp( $now );
- $seqVal = $dbw->nextSequenceValue( 'cur_cur_id_seq' );
-
- $dbw->insert( 'cur', array(
- 'cur_id' => $seqVal,
- 'cur_namespace' => $this->getNamespace(),
- 'cur_title' => $this->getDBkey(),
- 'cur_comment' => $comment,
- 'cur_user' => $wgUser->getID(),
- 'cur_user_text' => $wgUser->getName(),
- 'cur_timestamp' => $now,
- 'inverse_timestamp' => $won,
- 'cur_touched' => $now,
- 'cur_is_redirect' => 1,
- 'cur_is_new' => 1,
- 'cur_text' => "#REDIRECT [[" . $dest->getPrefixedText() . "]]\n"
+
+ $seqVal = $dbw->nextSequenceValue( 'page_page_id_seq' );
+ $dbw->insert( 'page', array(
+ 'page_id' => $seqVal,
+ 'page_namespace' => $this->getNamespace(),
+ 'page_title' => $this->getDBkey(),
+ 'page_touched' => $now,
+ 'page_is_redirect' => 1,
+ 'page_is_new' => 1,
+ 'page_latest' => NULL,
), $fname );
$newid = $dbw->insertId();
+
+ $seqVal = $dbw->nextSequenceValue( 'text_old_id_seq' );
+ $dbw->insert( 'text', array(
+ 'old_id' => $seqVal,
+ 'old_flags' => '',
+ 'old_text' => "#REDIRECT [[" . $dest->getPrefixedText() . "]]\n"
+ ), $fname );
+ $revisionId = $dbw->insertId();
+
+ $dbw->insert( 'revision', array(
+ 'rev_id' => $seqVal,
+ 'rev_page' => $newid,
+ 'rev_comment' => $comment,
+ 'rev_user' => $wgUser->getID(),
+ 'rev_user_text' => $wgUser->getName(),
+ 'rev_timestamp' => $now,
+ 'inverse_timestamp' => $won,
+ ), $fname );
+
+ $dbw->update( 'page',
+ /* SET */ array( 'page_latest' => $revisionId ),
+ /* WHERE */ array( 'page_id' => $newid ),
+ $fname );
$this->resetArticleID( $newid );
# Link table
$sk =& $wgUser->getSkin();
$parents = array();
$dbr =& wfGetDB( DB_SLAVE );
- $cur = $dbr->tableName( 'cur' );
$categorylinks = $dbr->tableName( 'categorylinks' );
# NEW SQL
- $sql = "SELECT * FROM categorylinks"
+ $sql = "SELECT * FROM $categorylinks"
." WHERE cl_from='$titlekey'"
." AND cl_from <> '0'"
." ORDER BY cl_sortkey";
}
/**
- * Go through all parent categories of this Title
+ * Get a tree of parent categories
+ * @param array $children an array with the children in the keys, to check for circular refs
* @return array
* @access public
*/
- function getCategorieBrowser() {
+ function getParentCategoryTree( $children = array() ) {
$parents = $this->getParentCategories();
if($parents != '') {
foreach($parents as $parent => $current)
{
- $nt = Title::newFromText($parent);
- $stack[$parent] = $nt->getCategorieBrowser();
+ if ( array_key_exists( $parent, $children ) ) {
+ # Circular reference
+ $stack[$parent] = array();
+ } else {
+ $nt = Title::newFromText($parent);
+ $stack[$parent] = $nt->getParentCategoryTree( $children + array($parent => 1) );
+ }
}
return $stack;
} else {
* @access public
*/
function curCond() {
+ wfDebugDieBacktrace( 'curCond called' );
return array( 'cur_namespace' => $this->mNamespace, 'cur_title' => $this->mDbkeyform );
}
* @access public
*/
function oldCond() {
+ wfDebugDieBacktrace( 'oldCond called' );
return array( 'old_namespace' => $this->mNamespace, 'old_title' => $this->mDbkeyform );
}
*/
function getPreviousRevisionID( $revision ) {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->selectField( 'old', 'old_id',
- 'old_title=' . $dbr->addQuotes( $this->getDBkey() ) .
- ' AND old_namespace=' . IntVal( $this->getNamespace() ) .
- ' AND old_id<' . IntVal( $revision ) . ' ORDER BY old_id DESC' );
+ return $dbr->selectField( 'revision', 'rev_id',
+ 'rev_page=' . IntVal( $this->getArticleId() ) .
+ ' AND rev_id<' . IntVal( $revision ) . ' ORDER BY rev_id DESC' );
}
/**
*/
function getNextRevisionID( $revision ) {
$dbr =& wfGetDB( DB_SLAVE );
- return $dbr->selectField( 'old', 'old_id',
- 'old_title=' . $dbr->addQuotes( $this->getDBkey() ) .
- ' AND old_namespace=' . IntVal( $this->getNamespace() ) .
- ' AND old_id>' . IntVal( $revision ) . ' ORDER BY old_id' );
+ return $dbr->selectField( 'revision', 'rev_id',
+ 'rev_page=' . IntVal( $this->getArticleId() ) .
+ ' AND rev_id>' . IntVal( $revision ) . ' ORDER BY rev_id' );
}
}
dépôts / lhc / web / wiklou.git / blobdiff