https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112515
Revision: 112515
Author: foxtrott
Date: 2012-02-27 21:00:37 +0000 (Mon, 27 Feb 2012)
Log Message:
-----------
revert r112344, part revert r112224: SpecialPageFactory does not exist until MW
1.18
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_Form.php
trunk/extensions/SemanticForms/includes/SF_FormLinker.php
trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
trunk/extensions/SemanticForms/includes/SF_Utils.php
trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
trunk/extensions/SemanticForms/specials/SF_FormEdit.php
trunk/extensions/SemanticForms/specials/SF_FormStart.php
Modified: trunk/extensions/SemanticForms/includes/SF_Form.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_Form.php 2012-02-27 20:57:58 UTC
(rev 112514)
+++ trunk/extensions/SemanticForms/includes/SF_Form.php 2012-02-27 21:00:37 UTC
(rev 112515)
@@ -52,7 +52,7 @@
function createMarkup() {
$title = Title::makeTitle( SF_NS_FORM, $this->mFormName );
- $fs = SpecialPageFactory::getPage( 'FormStart' );
+ $fs = SFUtils::getSpecialPage( 'FormStart' );
$form_start_url = SFUtils::titleURLString( $fs->getTitle() ) .
"/" . $title->getPartialURL();
$form_description = wfMsgForContent( 'sf_form_docu',
$this->mFormName, $form_start_url );
$form_input = "{{#forminput:form=" . $this->mFormName;
Modified: trunk/extensions/SemanticForms/includes/SF_FormLinker.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormLinker.php 2012-02-27
20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/includes/SF_FormLinker.php 2012-02-27
21:00:37 UTC (rev 112515)
@@ -204,7 +204,7 @@
return null;
}
- $fe = SpecialPageFactory::getPage( 'FormEdit' );
+ $fe = SFUtils::getSpecialPage( 'FormEdit' );
$fe_url = $fe->getTitle()->getLocalURL();
if ( count( $default_forms ) > 0 ) {
Modified: trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
2012-02-27 20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php
2012-02-27 21:00:37 UTC (rev 112515)
@@ -273,7 +273,7 @@
}
}
- $fs = SpecialPageFactory::getPage( 'FormStart' );
+ $fs = SFUtils::getSpecialPage( 'FormStart' );
$fs_url = $fs->getTitle()->getLocalURL();
$str = <<<END
Modified: trunk/extensions/SemanticForms/includes/SF_Utils.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_Utils.php 2012-02-27
20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/includes/SF_Utils.php 2012-02-27
21:00:37 UTC (rev 112515)
@@ -296,7 +296,7 @@
$output = $wgOut;
} else {
$output = $parser->getOutput();
- self::addJavascriptFiles( $parser );
+ self::addJavascriptFiles( $parser );
}
$output->addModules( 'ext.semanticforms.main' );
@@ -306,7 +306,7 @@
$output->addModules( 'ext.semanticforms.submit' );
$output->addModules( 'ext.smw.tooltips' );
$output->addModules( 'ext.smw.sorttable' );
- }
+ }
/**
* Returns an array of all form names on this wiki.
@@ -719,6 +719,22 @@
}
/**
+ * Compatibility helper function.
+ * Since 1.18 SpecialPageFactory::getPage should be used.
+ * SpecialPage::getPage is deprecated in 1.18.
+ *
+ * @since 2.3.3
+ *
+ * @param string $pageName
+ *
+ * @return SpecialPage|null
+ */
+ public static function getSpecialPage( $pageName ) {
+ $hasFactory = class_exists( 'SpecialPageFactory' ) &&
method_exists( 'SpecialPageFactory', 'getPage' );
+ return $hasFactory ? SpecialPageFactory::getPage( $pageName ) :
SpecialPage::getPage( $pageName );
+ }
+
+ /**
* Returns a SQL condition for autocompletion substring value in a
column.
* @param string $value_column Value column name
* @param string $substring Substring to look for
@@ -862,7 +878,7 @@
}
}
- $ad = SpecialPageFactory::getPage( $specialPageName );
+ $ad = SFUtils::getSpecialPage( $specialPageName );
$link_url = $ad->getTitle()->getLocalURL() . "/$inFormName";
if ( ! empty( $inTargetName ) ) {
$link_url .= "/$inTargetName";
@@ -909,7 +925,7 @@
}
static function loadScriptsForPopupForm( &$parser ) {
- $parser->getOutput()->addModules(
'ext.semanticforms.popupformedit' );
+ $parser->getOutput()->addModules(
'ext.semanticforms.popupformedit' );
return true;
}
Modified: trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
===================================================================
--- trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
2012-02-27 20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
2012-02-27 21:00:37 UTC (rev 112515)
@@ -94,7 +94,7 @@
}
public static function uploadableHTML( $input_id, $delimiter = null,
$default_filename = null, $cur_value = '', $other_args = array() ) {
- $upload_window_page = SpecialPageFactory::getPage(
'UploadWindow' );
+ $upload_window_page = SFUtils::getSpecialPage( 'UploadWindow' );
$query_string = "sfInputID=$input_id";
if ( $delimiter != null ) {
$query_string .= "&sfDelimiter=$delimiter";
Modified: trunk/extensions/SemanticForms/specials/SF_FormEdit.php
===================================================================
--- trunk/extensions/SemanticForms/specials/SF_FormEdit.php 2012-02-27
20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/specials/SF_FormEdit.php 2012-02-27
21:00:37 UTC (rev 112515)
@@ -71,7 +71,7 @@
static function printAltFormsList( $alt_forms, $target_name ) {
$text = "";
- $fe = SpecialPageFactory::getPage( 'FormEdit' );
+ $fe = SFUtils::getSpecialPage( 'FormEdit' );
$fe_url = $fe->getTitle()->getFullURL();
$i = 0;
foreach ( $alt_forms as $alt_form ) {
Modified: trunk/extensions/SemanticForms/specials/SF_FormStart.php
===================================================================
--- trunk/extensions/SemanticForms/specials/SF_FormStart.php 2012-02-27
20:57:58 UTC (rev 112514)
+++ trunk/extensions/SemanticForms/specials/SF_FormStart.php 2012-02-27
21:00:37 UTC (rev 112515)
@@ -121,7 +121,7 @@
* Helper function - returns a URL that includes Special:FormEdit.
*/
static function getFormEditURL( $formName, $targetName) {
- $fe = SpecialPageFactory::getPage( 'FormEdit' );
+ $fe = SFUtils::getSpecialPage( 'FormEdit' );
// Special handling for forms whose name contains a slash.
if ( strpos( $formName, '/' ) !== false ) {
return $fe->getTitle()->getLocalURL( array( 'form' =>
$formName, 'target' => $targetName ) );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
