http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95699
Revision: 95699
Author: yaron
Date: 2011-08-29 21:20:32 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
More cleanup, including renaming GeneratePages and EditSchema classes to
PSGeneratePages and PSEditSchema
Modified Paths:
--------------
trunk/extensions/PageSchemas/PS_Tabs.php
trunk/extensions/PageSchemas/PageSchemas.classes.php
trunk/extensions/PageSchemas/PageSchemas.php
trunk/extensions/PageSchemas/specials/PS_EditSchema.php
trunk/extensions/PageSchemas/specials/PS_GeneratePages.php
Modified: trunk/extensions/PageSchemas/PS_Tabs.php
===================================================================
--- trunk/extensions/PageSchemas/PS_Tabs.php 2011-08-29 21:06:15 UTC (rev
95698)
+++ trunk/extensions/PageSchemas/PS_Tabs.php 2011-08-29 21:20:32 UTC (rev
95699)
@@ -61,11 +61,11 @@
$categoryName = $title->getText();
if ( $action == 'generatepages' ) {
- $gen_page = new GeneratePages();
+ $gen_page = new PSGeneratePages();
$gen_page->execute( $categoryName );
return false;
} elseif ( $action == 'editschema' ) {
- $edit_schema = new EditSchema();
+ $edit_schema = new PSEditSchema();
$edit_schema->execute( $categoryName );
return false;
}
Modified: trunk/extensions/PageSchemas/PageSchemas.classes.php
===================================================================
--- trunk/extensions/PageSchemas/PageSchemas.classes.php 2011-08-29
21:06:15 UTC (rev 95698)
+++ trunk/extensions/PageSchemas/PageSchemas.classes.php 2011-08-29
21:20:32 UTC (rev 95699)
@@ -64,7 +64,7 @@
if ( $namespace != '' ) {
$namespace .= ':';
}
- if ( self::isCapitalized( $title ) ) {
+ if ( MWNamespace::isCapitalized( $title->getNamespace() ) ) {
global $wgContLang;
return $namespace . $wgContLang->ucfirst(
$title->getText() );
} else {
@@ -72,10 +72,6 @@
}
}
- public static function isCapitalized( $title ) {
- return MWNamespace::isCapitalized( $title->getNamespace() );
- }
-
public static function validateXML( $xml, &$error_msg ) {
$xmlDTD =<<<END
<?xml version="1.0" encoding="utf-8"?>
Modified: trunk/extensions/PageSchemas/PageSchemas.php
===================================================================
--- trunk/extensions/PageSchemas/PageSchemas.php 2011-08-29 21:06:15 UTC
(rev 95698)
+++ trunk/extensions/PageSchemas/PageSchemas.php 2011-08-29 21:20:32 UTC
(rev 95699)
@@ -45,12 +45,12 @@
$wgAutoloadClasses['PageSchemas'] = $dir . 'PageSchemas.classes.php';
$wgAutoloadClasses['PSSchema'] = $dir . 'PageSchemas.classes.php';
$wgAutoloadClasses['ApiQueryPageSchemas'] = $dir . 'ApiQueryPageSchemas.php';
-$wgAutoloadClasses['GeneratePages'] = $dir . 'specials/PS_GeneratePages.php';
-$wgAutoloadClasses['EditSchema'] = $dir . 'specials/PS_EditSchema.php';
+$wgAutoloadClasses['PSGeneratePages'] = $dir . 'specials/PS_GeneratePages.php';
+$wgAutoloadClasses['PSEditSchema'] = $dir . 'specials/PS_EditSchema.php';
$wgAutoloadClasses['PSTabs'] = $dir . 'PS_Tabs.php';
// registering Special page
-$wgSpecialPages['GeneratePages'] = 'GeneratePages';
-$wgSpecialPages['EditSchema'] = 'EditSchema';
+$wgSpecialPages['GeneratePages'] = 'PSGeneratePages';
+$wgSpecialPages['EditSchema'] = 'PSEditSchema';
$wgSpecialPageGroups['GeneratePages'] = 'other';
$wgSpecialPageGroups['EditSchema'] = 'other';
// Register parser hook
Modified: trunk/extensions/PageSchemas/specials/PS_EditSchema.php
===================================================================
--- trunk/extensions/PageSchemas/specials/PS_EditSchema.php 2011-08-29
21:06:15 UTC (rev 95698)
+++ trunk/extensions/PageSchemas/specials/PS_EditSchema.php 2011-08-29
21:20:32 UTC (rev 95699)
@@ -5,7 +5,7 @@
* @author Ankit Garg
*/
-class EditSchema extends IncludableSpecialPage {
+class PSEditSchema extends IncludableSpecialPage {
function __construct() {
parent::__construct( 'EditSchema' );
}
Modified: trunk/extensions/PageSchemas/specials/PS_GeneratePages.php
===================================================================
--- trunk/extensions/PageSchemas/specials/PS_GeneratePages.php 2011-08-29
21:06:15 UTC (rev 95698)
+++ trunk/extensions/PageSchemas/specials/PS_GeneratePages.php 2011-08-29
21:20:32 UTC (rev 95699)
@@ -5,7 +5,7 @@
* @author Ankit Garg
*/
-class GeneratePages extends IncludableSpecialPage {
+class PSGeneratePages extends IncludableSpecialPage {
function __construct() {
parent::__construct( 'GeneratePages' );
}
@@ -16,7 +16,7 @@
$this->setHeaders();
$param = $wgRequest->getText('param');
if ( $param != "" && $category != "" ) {
- $this->generatePages( $param, $_POST['page'] );
+ $this->generatePages( $param, $wgRequest->getValues(
'page' ) );
$text = '<p>All pages will be generated! </p>';
$wgOut->addHTML( $text );
return true;
@@ -66,7 +66,7 @@
return true;
}
- function generatePages ( $categoryName, $toGenPageList ) {
+ function generatePages( $categoryName, $toGenPageList ) {
$pageSchema = new PSSchema( $categoryName );
$pageSchema->generateAllPages( $toGenPageList );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
