https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113080
Revision: 113080
Author: yaron
Date: 2012-03-05 20:40:13 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
More changes to comments and code now that MW 1.16 is no longer supported
Modified Paths:
--------------
trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
trunk/extensions/SemanticForms/specials/SF_RunQuery.php
trunk/extensions/SemanticForms/specials/SF_UploadWindow.php
Modified: trunk/extensions/SemanticForms/includes/SF_FormPrinter.php
===================================================================
--- trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-03-05
20:34:29 UTC (rev 113079)
+++ trunk/extensions/SemanticForms/includes/SF_FormPrinter.php 2012-03-05
20:40:13 UTC (rev 113080)
@@ -389,8 +389,8 @@
if ( ! $form_submitted && ( $this->mPageTitle &&
!$this->mPageTitle->exists() ) ) {
$this->showDeletionLog( $wgOut );
}
- // Unfortunately, we can't just call userCan() here because, as
of MW 1.16,
- // it has a bug in which it ignores a setting of
+ // Unfortunately, we can't just call userCan() here because,
+ // since MW 1.16, it has a bug in which it ignores a setting of
// "$wgEmailConfirmToEdit = true;". Instead, we'll just get the
// permission errors from the start, and use those to determine
whether
// the page is editable.
Modified: trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
===================================================================
--- trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
2012-03-05 20:34:29 UTC (rev 113079)
+++ trunk/extensions/SemanticForms/includes/forminputs/SF_TextInput.php
2012-03-05 20:40:13 UTC (rev 113080)
@@ -104,12 +104,8 @@
}
$upload_window_url =
$upload_window_page->getTitle()->getFullURL( $query_string );
$upload_label = wfMsg( 'upload' );
- // window needs to be bigger for MediaWiki version 1.16+
- if ( class_exists( 'HTMLForm' ) ) {
- $style = "width:650 height:500";
- } else {
- $style = '';
- }
+ // We need to set the size by default.
+ $style = "width:650 height:500";
$cssClasses = array( 'sfFancyBox', 'sfUploadable' );
Modified: trunk/extensions/SemanticForms/specials/SF_RunQuery.php
===================================================================
--- trunk/extensions/SemanticForms/specials/SF_RunQuery.php 2012-03-05
20:34:29 UTC (rev 113079)
+++ trunk/extensions/SemanticForms/specials/SF_RunQuery.php 2012-03-05
20:40:13 UTC (rev 113080)
@@ -158,8 +158,9 @@
}
}
- // Finally, set the page title - for MW 1.16, this has to be
- // called after addParserOutputNoText() for it to take effect.
+ // Finally, set the page title - previously, this had to be
+ // called after addParserOutputNoText() for it to take effect;
+ // now the order doesn't matter.
if ( !$embedded ) {
if ( $form_page_title != null ) {
$wgOut->setPageTitle( $form_page_title );
Modified: trunk/extensions/SemanticForms/specials/SF_UploadWindow.php
===================================================================
--- trunk/extensions/SemanticForms/specials/SF_UploadWindow.php 2012-03-05
20:34:29 UTC (rev 113079)
+++ trunk/extensions/SemanticForms/specials/SF_UploadWindow.php 2012-03-05
20:40:13 UTC (rev 113080)
@@ -94,7 +94,7 @@
if ( $this->mSourceType == 'file' && $token == null ) {
// Skip token check for file uploads as that can't be
faked via JS...
// Some client-side tools don't expect to need to send
wpEditToken
- // with their submissions, as that's new in 1.16.
+ // with their submissions, as that was new in 1.16.
$this->mTokenOk = true;
} else {
$this->mTokenOk = $wgUser->matchEditToken( $token );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
