http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88536
Revision: 88536
Author: reedy
Date: 2011-05-21 19:35:16 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Fix function level comments that start with /* not /**
Modified Paths:
--------------
trunk/phase3/includes/Article.php
trunk/phase3/includes/ChangesFeed.php
trunk/phase3/includes/ConfEditor.php
trunk/phase3/includes/EditPage.php
trunk/phase3/includes/MimeMagic.php
trunk/phase3/includes/Title.php
trunk/phase3/includes/db/DatabaseSqlite.php
trunk/phase3/includes/db/LBFactory.php
trunk/phase3/includes/filerepo/File.php
trunk/phase3/includes/filerepo/FileRepo.php
trunk/phase3/includes/filerepo/ForeignAPIRepo.php
trunk/phase3/includes/installer/SqliteInstaller.php
trunk/phase3/includes/media/BMP.php
trunk/phase3/includes/media/Generic.php
trunk/phase3/includes/media/SVG.php
trunk/phase3/includes/media/SVGMetadataExtractor.php
trunk/phase3/includes/media/XMP.php
trunk/phase3/includes/objectcache/BagOStuff.php
trunk/phase3/includes/parser/CoreParserFunctions.php
trunk/phase3/includes/search/SearchPostgres.php
Modified: trunk/phase3/includes/Article.php
===================================================================
--- trunk/phase3/includes/Article.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/Article.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -2703,7 +2703,7 @@
}
- /*
+ /**
* UI entry point for page deletion
*/
public function delete() {
Modified: trunk/phase3/includes/ChangesFeed.php
===================================================================
--- trunk/phase3/includes/ChangesFeed.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/ChangesFeed.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -61,11 +61,11 @@
FeedUtils::checkPurge( $timekey, $key );
- /*
- * Bumping around loading up diffs can be pretty slow, so where
- * possible we want to cache the feed output so the next visitor
- * gets it quick too.
- */
+ /**
+ * Bumping around loading up diffs can be pretty slow, so where
+ * possible we want to cache the feed output so the next visitor
+ * gets it quick too.
+ */
$cachedFeed = $this->loadFromCache( $lastmod, $timekey, $key );
if( is_string( $cachedFeed ) ) {
wfDebug( "RC: Outputting cached feed\n" );
@@ -110,12 +110,12 @@
$feedLastmod = $messageMemc->get( $timekey );
if( ( $wgFeedCacheTimeout > 0 ) && $feedLastmod ) {
- /*
- * If the cached feed was rendered very recently, we may
- * go ahead and use it even if there have been edits made
- * since it was rendered. This keeps a swarm of requests
- * from being too bad on a super-frequently edited wiki.
- */
+ /**
+ * If the cached feed was rendered very recently, we may
+ * go ahead and use it even if there have been edits
made
+ * since it was rendered. This keeps a swarm of requests
+ * from being too bad on a super-frequently edited wiki.
+ */
$feedAge = time() - wfTimestamp( TS_UNIX, $feedLastmod
);
$feedLastmodUnix = wfTimestamp( TS_UNIX, $feedLastmod );
Modified: trunk/phase3/includes/ConfEditor.php
===================================================================
--- trunk/phase3/includes/ConfEditor.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/ConfEditor.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -472,7 +472,7 @@
return $extraPath;
}
- /*
+ /**
* Find the path name of first element in the array.
* If the array is empty, this will return the \@extra interstitial
element.
* If the specified path is not found or is not an array, it will
return false.
Modified: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/EditPage.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -287,7 +287,7 @@
return '';
}
- /*
+ /**
* Check if a page was deleted while the user was editing it, before
submit.
* Note that we rely on the logging table, which hasn't been always
there,
* but that doesn't matter, because this only applies to brand new
@@ -1882,7 +1882,7 @@
$wgOut->addHTML( "</div><!-- editButtons -->\n</div><!--
editOptions -->\n" );
}
- /*
+ /**
* Show an edit conflict. textbox1 is already shown in showEditForm().
* If you want to use another entry point to this function, be careful.
*/
Modified: trunk/phase3/includes/MimeMagic.php
===================================================================
--- trunk/phase3/includes/MimeMagic.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/MimeMagic.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -157,11 +157,11 @@
private static $extensionLoaded = false;
/** Initializes the MimeMagic object. This is called by
MimeMagic::singleton().
- *
- * This constructor parses the mime.types and mime.info files and build
internal mappings.
- */
+ *
+ * This constructor parses the mime.types and mime.info files and build
internal mappings.
+ */
function __construct() {
- /*
+ /**
* --- load mime.types ---
*/
@@ -244,9 +244,9 @@
}
}
- /*
- * --- load mime.info ---
- */
+ /**
+ * --- load mime.info ---
+ */
global $wgMimeInfoFile;
if ( $wgMimeInfoFile == 'includes/mime.info' ) {
@@ -628,7 +628,7 @@
return "image/webp";
}
- /*
+ /**
* Look for PHP. Check for this before HTML/XML... Warning:
this is a
* heuristic, and won't match a file with a lot of non-PHP
before. It
* will also match text files which could be PHP. :)
@@ -652,7 +652,7 @@
return 'application/x-php';
}
- /*
+ /**
* look for XML formats (XHTML and SVG)
*/
$xml = new XmlTypeCheck( $file );
@@ -665,7 +665,7 @@
}
}
- /*
+ /**
* look for shell scripts
*/
$script_type = null;
Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/Title.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -1770,7 +1770,7 @@
# Not a public wiki, so no shortcut
$useShortcut = false;
} elseif ( !empty( $wgRevokePermissions ) ) {
- /*
+ /**
* Iterate through each group with permissions
being revoked (key not included since we don't care
* what the group name is), then check if the
read permission is being revoked. If it is, then
* we don't use the shortcut below since the
user might not be able to read, even though anon
Modified: trunk/phase3/includes/db/DatabaseSqlite.php
===================================================================
--- trunk/phase3/includes/db/DatabaseSqlite.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/db/DatabaseSqlite.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -620,7 +620,7 @@
return $s;
}
- /*
+ /**
* Build a concatenation list to feed into a SQL query
*
* @return string
Modified: trunk/phase3/includes/db/LBFactory.php
===================================================================
--- trunk/phase3/includes/db/LBFactory.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/db/LBFactory.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -80,7 +80,7 @@
*/
abstract function getMainLB( $wiki = false );
- /*
+ /**
* Create a new load balancer for external storage. The resulting
object will be
* untracked, not chronology-protected, and the caller is responsible
for
* cleaning it up.
@@ -90,7 +90,7 @@
*/
abstract function newExternalLB( $cluster, $wiki = false );
- /*
+ /**
* Get a cached (tracked) load balancer for external storage
*
* @param $cluster String: external storage cluster, or false for core
Modified: trunk/phase3/includes/filerepo/File.php
===================================================================
--- trunk/phase3/includes/filerepo/File.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/filerepo/File.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -930,6 +930,7 @@
function getRepoName() {
return $this->repo ? $this->repo->getName() : 'unknown';
}
+
/*
* Returns the repository
*/
Modified: trunk/phase3/includes/filerepo/FileRepo.php
===================================================================
--- trunk/phase3/includes/filerepo/FileRepo.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/filerepo/FileRepo.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -150,7 +150,7 @@
return false;
}
- /*
+ /**
* Find many files at once.
* @param $items An array of titles, or an array of findFile() options
with
* the "title" option giving the title. Example:
Modified: trunk/phase3/includes/filerepo/ForeignAPIRepo.php
===================================================================
--- trunk/phase3/includes/filerepo/ForeignAPIRepo.php 2011-05-21 19:32:28 UTC
(rev 88535)
+++ trunk/phase3/includes/filerepo/ForeignAPIRepo.php 2011-05-21 19:35:16 UTC
(rev 88536)
@@ -216,7 +216,7 @@
}
}
- /*
+ /**
* Return the imageurl from cache if possible
*
* If the url has been requested today, get it from cache
Modified: trunk/phase3/includes/installer/SqliteInstaller.php
===================================================================
--- trunk/phase3/includes/installer/SqliteInstaller.php 2011-05-21 19:32:28 UTC
(rev 88535)
+++ trunk/phase3/includes/installer/SqliteInstaller.php 2011-05-21 19:35:16 UTC
(rev 88536)
@@ -45,7 +45,7 @@
$this->getTextBox( 'wgDBname', 'config-db-name',
array(), $this->parent->getHelpBox( 'config-sqlite-name-help' ) );
}
- /*
+ /**
* Safe wrapper for PHP's realpath() that fails gracefully if it's
unable to canonicalize the path.
*/
private static function realpath( $path ) {
Modified: trunk/phase3/includes/media/BMP.php
===================================================================
--- trunk/phase3/includes/media/BMP.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/media/BMP.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -23,7 +23,7 @@
return array( 'png', 'image/png' );
}
- /*
+ /**
* Get width and height from the bmp header.
*/
function getImageSize( $image, $filename ) {
Modified: trunk/phase3/includes/media/Generic.php
===================================================================
--- trunk/phase3/includes/media/Generic.php 2011-05-21 19:32:28 UTC (rev
88535)
+++ trunk/phase3/includes/media/Generic.php 2011-05-21 19:35:16 UTC (rev
88536)
@@ -48,7 +48,7 @@
*/
abstract function getParamMap();
- /*
+ /**
* Validate a thumbnail parameter at parse time.
* Return true to accept the parameter, and false to reject it.
* If you return false, the parser will do something quiet and
forgiving.
Modified: trunk/phase3/includes/media/SVG.php
===================================================================
--- trunk/phase3/includes/media/SVG.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/media/SVG.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -105,7 +105,7 @@
}
}
- /*
+ /**
* Transform an SVG file to PNG
* This function can be called outside of thumbnail contexts
* @param string $srcPath
Modified: trunk/phase3/includes/media/SVGMetadataExtractor.php
===================================================================
--- trunk/phase3/includes/media/SVGMetadataExtractor.php 2011-05-21
19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/media/SVGMetadataExtractor.php 2011-05-21
19:35:16 UTC (rev 88536)
@@ -83,14 +83,14 @@
wfRestoreWarnings();
}
- /*
+ /**
* @return Array with the known metadata
*/
public function getMetadata() {
return $this->metadata;
}
- /*
+ /**
* Read the SVG
*/
public function read() {
@@ -142,7 +142,7 @@
return true;
}
- /*
+ /**
* Read a textelement from an element
*
* @param String $name of the element that we are reading from
@@ -179,7 +179,7 @@
$this->reader->next();
}
- /*
+ /**
* Filter all children, looking for animate elements
*
* @param String $name of the element that we are reading from
@@ -238,7 +238,7 @@
wfDebug( "SVGReader WARN: $data\n" );
}
- /*
+ /**
* Parse the attributes of an SVG element
*
* The parser has to be in the start element of <svg>
Modified: trunk/phase3/includes/media/XMP.php
===================================================================
--- trunk/phase3/includes/media/XMP.php 2011-05-21 19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/media/XMP.php 2011-05-21 19:35:16 UTC (rev 88536)
@@ -40,7 +40,7 @@
protected $items;
- /*
+ /**
* These are various mode constants.
* they are used to figure out what to do
* with an element when its encountered.
Modified: trunk/phase3/includes/objectcache/BagOStuff.php
===================================================================
--- trunk/phase3/includes/objectcache/BagOStuff.php 2011-05-21 19:32:28 UTC
(rev 88535)
+++ trunk/phase3/includes/objectcache/BagOStuff.php 2011-05-21 19:35:16 UTC
(rev 88536)
@@ -64,7 +64,7 @@
*/
abstract public function set( $key, $value, $exptime = 0 );
- /*
+ /**
* Delete an item.
* @param $key string
* @param $time int Amount of time to delay the operation (mostly
memcached-specific)
Modified: trunk/phase3/includes/parser/CoreParserFunctions.php
===================================================================
--- trunk/phase3/includes/parser/CoreParserFunctions.php 2011-05-21
19:32:28 UTC (rev 88535)
+++ trunk/phase3/includes/parser/CoreParserFunctions.php 2011-05-21
19:35:16 UTC (rev 88536)
@@ -442,10 +442,11 @@
return '';
return wfUrlencode( $t->getSubjectNsText() );
}
- /*
+
+ /**
* Functions to get and normalize pagenames, corresponding to the magic
words
* of the same names
- */
+ */
static function pagename( $parser, $title = null ) {
$t = Title::newFromText( $title );
if ( is_null( $t ) )
Modified: trunk/phase3/includes/search/SearchPostgres.php
===================================================================
--- trunk/phase3/includes/search/SearchPostgres.php 2011-05-21 19:32:28 UTC
(rev 88535)
+++ trunk/phase3/includes/search/SearchPostgres.php 2011-05-21 19:35:16 UTC
(rev 88536)
@@ -67,11 +67,10 @@
return new PostgresSearchResultSet( $resultSet,
$this->searchTerms );
}
-
- /*
+ /**
* Transform the user's search string into a better form for tsearch2
* Returns an SQL fragment consisting of quoted text to search for.
- */
+ */
function parseQuery( $term ) {
wfDebug( "parseQuery received: $term \n" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
