Hello,
could all developpers please ensure that their text editor doesn't mess
up whitespaces in the files? Those CVS commit messages are totally
useless if the text editor adds or removes whitespace all over the file.
Thank you.
JeLuF
On Sat, Jul 24, 2004 at 01:18:17PM +0000, Timwi wrote:
Update of /cvsroot/wikipedia/phase3/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27133/includes
Modified Files:
Skin.php
Log Message:
Tim Starling removed the line where $func is set to 'makeLink', but left it in
where
it is used as a function name. I'm pretty sure that would give rise to a bug. :)
Replacing $func with makeLink.
Index: Skin.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/Skin.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** Skin.php 24 Jul 2004 10:55:35 -0000 1.234
--- Skin.php 24 Jul 2004 13:18:14 -0000 1.235
***************
*** 67,71 ****
return "standard";
}
!
# Get/set accessor for delayed link colouring
function postParseLinkColour( $setting = NULL ) {
--- 67,71 ----
return "standard";
}
!
# Get/set accessor for delayed link colouring
function postParseLinkColour( $setting = NULL ) {
***************
*** 1477,1483 ****
}
}
!
# Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders()
! $retVal = '<!--LINK ' . implode( ' ', array(
$nt->getNamespace(), $nt->getDBkey(),
$query, $prefix . $text . $inside ) ) . "-->{$trail}";
} else {
--- 1477,1483 ----
}
}
!
# Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders()
! $retVal = '<!--LINK ' . implode( ' ', array(
$nt->getNamespace(), $nt->getDBkey(),
$query, $prefix . $text . $inside ) ) . "-->{$trail}";
} else {
***************
*** 1488,1494 ****
} else {
$threshold = $wgUser->getOption('stubthreshold') ;
! if ( $threshold > 0 ) {
$dbr =& wfGetDB( DB_SLAVE );
! $s = $dbr->selectRow( 'cur', array( 'LENGTH(cur_text) AS x',
'cur_namespace',
'cur_is_redirect' ), array( 'cur_id' => $aid ), $fname ) ;
if ( $s !== false ) {
--- 1488,1494 ----
} else {
$threshold = $wgUser->getOption('stubthreshold') ;
! if ( $threshold > 0 ) {
$dbr =& wfGetDB( DB_SLAVE );
! $s = $dbr->selectRow( 'cur', array( 'LENGTH(cur_text) AS x',
'cur_namespace',
'cur_is_redirect' ), array( 'cur_id' => $aid ), $fname ) ;
if ( $s !== false ) {
***************
*** 2500,2508 ****
if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch )
) {
# Media link
! $comment = preg_replace( '/\[\[(.*?)\]\]/', $this->makeMediaLink(
$submatch[1], "", $text ),
$comment, 1 );
} else {
# Other kind of link
! $comment = preg_replace('/\[\[(.*?)\]\]/', $this->$func( $match[1],
$match[1] ),
$comment , 1);
}
--- 2500,2508 ----
if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch )
) {
# Media link
! $comment = preg_replace( '/\[\[(.*?)\]\]/', $this->makeMediaLink(
$submatch[1], "", $text ),
$comment, 1 );
} else {
# Other kind of link
! $comment = preg_replace('/\[\[(.*?)\]\]/', $this->makeLink( $match[1],
$match[1] ),
$comment , 1);
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS(a)wikimedia.org
http://mail.wikipedia.org/mailman/listinfo/mediawiki-cvs