Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/210054
Change subject: Fixed calling of MW messages that now include URLs
......................................................................
Fixed calling of MW messages that now include URLs
Messages are 'anoneditwarning', 'uploadnologintext'.
Change-Id: I9e19fd08e53e53bae9d376e2e0f386c93b38bd2d
---
M includes/SF_FormPrinter.php
M specials/SF_UploadWindow.php
2 files changed, 13 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/54/210054/1
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index dbe0566..77cbd9c 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -544,15 +544,15 @@
if ( $is_query || $userCanEditPage ) {
$form_is_disabled = false;
// Show "Your IP address will be recorded" warning if
- // user is anonymous, and it's not a query -
- // wiki-text for bolding has to be replaced with HTML.
+ // user is anonymous, and it's not a query.
if ( $wgUser->isAnon() && ! $is_query ) {
- $anon_edit_warning = preg_replace(
- "/'''(.*)'''/",
- "<strong>$1</strong>",
- wfMessage( 'anoneditwarning' )->text()
- );
- $form_text .= "<p>$anon_edit_warning</p>\n";
+ // Based on code in MediaWiki's EditPage.php.
+ $anonEditWarning = wfMessage( 'anoneditwarning',
+ // Log-in link
+
'{{fullurl:Special:UserLogin|returnto={{FULLPAGENAMEE}}}}',
+ // Sign-up link
+
'{{fullurl:Special:UserLogin/signup|returnto={{FULLPAGENAMEE}}}}' )->parse();
+ $form_text .= Html::rawElement( 'div', array(
'id' => 'mw-anon-edit-warning', 'class' => 'warningbox' ), $anonEditWarning );
}
} else {
$form_is_disabled = true;
diff --git a/specials/SF_UploadWindow.php b/specials/SF_UploadWindow.php
index f072e91..c1b4b90 100644
--- a/specials/SF_UploadWindow.php
+++ b/specials/SF_UploadWindow.php
@@ -121,16 +121,11 @@
}
# Check permissions
- global $wgGroupPermissions;
- if ( !$this->getUser()->isAllowed( 'upload' ) ) {
- if ( !$this->getUser()->isLoggedIn() && (
$wgGroupPermissions['user']['upload']
- ||
$wgGroupPermissions['autoconfirmed']['upload'] ) ) {
- // Custom message if logged-in users without
any special rights can upload
- throw new ErrorPageError( 'uploadnologin',
'uploadnologintext' );
- } else {
- throw new PermissionsError( 'upload' );
- }
- }
+ $user = $this->getUser();
+ $permissionRequired = UploadBase::isAllowed( $user );
+ if ( $permissionRequired !== true ) {
+ throw new PermissionsError( $permissionRequired );
+ }
# Check blocks
if ( $this->getUser()->isBlocked() ) {
--
To view, visit https://gerrit.wikimedia.org/r/210054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e19fd08e53e53bae9d376e2e0f386c93b38bd2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
