http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97340
Revision: 97340
Author: reedy
Date: 2011-09-16 21:54:35 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Fix another old constructor
Documentation
Modified Paths:
--------------
trunk/extensions/ActiveAbstract/AbstractFilter.php
trunk/extensions/ActiveAbstract/GoogleCoopFilter.php
trunk/phase3/maintenance/backup.inc
Modified: trunk/extensions/ActiveAbstract/AbstractFilter.php
===================================================================
--- trunk/extensions/ActiveAbstract/AbstractFilter.php 2011-09-16 21:50:30 UTC
(rev 97339)
+++ trunk/extensions/ActiveAbstract/AbstractFilter.php 2011-09-16 21:54:35 UTC
(rev 97340)
@@ -28,6 +28,10 @@
$dumper->registerFilter( 'noredirect', 'NoredirectFilter' );
}
+ /**
+ * @param $sink ExportProgressFilter
+ * @param $params string
+ */
function __construct( &$sink, $params = '' ) {
$this->sink =& $sink;
@@ -98,7 +102,6 @@
* Extract an abstract from the page
* @params object $rev Database rows with revision data
* @return string
- * @access private
*/
function _abstract( $rev ) {
$text = Revision::getRevisionText( $rev ); // FIXME cache this
@@ -114,7 +117,6 @@
* Convert text to the preferred output language variant, if set.
* @param string $text
* @return string
- * @access private
*/
function _variant( $text ) {
if ( $this->variant ) {
@@ -129,7 +131,6 @@
* Strip markup to show plaintext
* @param string $text
* @return string
- * @access private
*/
function _stripMarkup( $text ) {
global $wgContLang;
@@ -166,7 +167,6 @@
* Extract the first two sentences, if detectable, from the text.
* @param string $text
* @return string
- * @access private
*/
function _extractStart( $text ) {
$endchars = array(
@@ -196,7 +196,6 @@
* Extract a list of TOC links
* @param object $rev Database rows with revision data
* @return array of URL strings, indexed by name/title
- * @access private
*
* @fixme extract TOC items properly
* @fixme check for explicit __NOTOC__
@@ -225,7 +224,6 @@
* Fetch the list of category links for this page
* @param object $rev Database rows with revision data
* @return array of URL strings, indexed by category name
- * @access private
*/
function _categoryLinks( $rev ) {
$id = $rev->page_id;
@@ -253,9 +251,8 @@
*
* @param string $url
* @param string $anchor Human-readable link text; eg title or fragment
- * @param string $linktype "nav" or "image"
+ * @param string $type "nav" or "image"
* @return string XML fragment
- * @access private
*/
function _formatLink( $url, $anchor, $type ) {
$maxUrlLength = 1024; // as defined in Yahoo's .xsd
@@ -267,6 +264,12 @@
}
class NoredirectFilter extends DumpFilter {
+
+ /**
+ * @param $page
+ * @param $string
+ * @return bool
+ */
function pass( $page, $string ) {
return !$page->page_is_redirect;
}
Modified: trunk/extensions/ActiveAbstract/GoogleCoopFilter.php
===================================================================
--- trunk/extensions/ActiveAbstract/GoogleCoopFilter.php 2011-09-16
21:50:30 UTC (rev 97339)
+++ trunk/extensions/ActiveAbstract/GoogleCoopFilter.php 2011-09-16
21:54:35 UTC (rev 97340)
@@ -48,6 +48,9 @@
parent::register( $dumper );
}
+ /**
+ * @param $sink ExportProgressFilter
+ */
function __construct( &$sink ) {
$this->sink =& $sink;
}
@@ -115,6 +118,9 @@
*
* This code needs a cleanup, it became rather ugly after adding
exception
* handling :-(
+ *
+ * @param $str
+ * @return array|string
*/
function _threeLines( $str ) {
$s = array();
Modified: trunk/phase3/maintenance/backup.inc
===================================================================
--- trunk/phase3/maintenance/backup.inc 2011-09-16 21:50:30 UTC (rev 97339)
+++ trunk/phase3/maintenance/backup.inc 2011-09-16 21:54:35 UTC (rev 97340)
@@ -337,7 +337,7 @@
}
class ExportProgressFilter extends DumpFilter {
- function ExportProgressFilter( &$sink, &$progress ) {
+ function __construct( &$sink, &$progress ) {
parent::__construct( $sink );
$this->progress = $progress;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
