Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185475
Change subject: Update farmer.sql
......................................................................
Update farmer.sql
* Updates farmer.sql and adds support for sqlite.
Change-Id: Ifc7dd1b500aa0c3a118201fe2e33c8f1561a45cf
---
M Farmer.php
M SpecialFarmer.php
M farmer.sql
3 files changed, 35 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Farmer
refs/changes/75/185475/1
diff --git a/Farmer.php b/Farmer.php
index ce78aa6..8425f8d 100644
--- a/Farmer.php
+++ b/Farmer.php
@@ -17,7 +17,7 @@
'author' => array( 'Gregory Szorc <[email protected]>', 'Alexandre
Emsenhuber' ),
'url' => 'https://www.mediawiki.org/wiki/Extension:Farmer',
'descriptionmsg' => 'farmer-desc',
- 'version' => '0.1.1',
+ 'version' => '0.1.2',
);
/**
diff --git a/SpecialFarmer.php b/SpecialFarmer.php
index 7a9fe15..94d55d8 100644
--- a/SpecialFarmer.php
+++ b/SpecialFarmer.php
@@ -148,13 +148,13 @@
$wgOut->addHtml( Xml::openElement( 'table',
array( 'class' => 'wikitable' ) ) . "\n" .
Xml::tags( 'tr', array(), Xml::tags(
'th', array(),
- wfMsgExt(
'farmer-confirmsetting-name', 'parseinline' ) ) . Xml::element( 'td', array(),
$name ) ) . "\n" .
+ wfMessage(
'farmer-confirmsetting-name' )->parse() ) . Xml::element( 'td', array(), $name
) ) . "\n" .
Xml::tags( 'tr', array(), Xml::tags(
'th', array(),
- wfMsgExt(
'farmer-confirmsetting-title', 'parseinline' ) ) . Xml::element( 'td', array(),
$title ) ) . "\n" .
+ wfMessage(
'farmer-confirmsetting-title' )->parse() ) . Xml::element( 'td', array(),
$title ) ) . "\n" .
Xml::tags( 'tr', array(), Xml::tags(
'th', array(),
- wfMsgExt(
'farmer-confirmsetting-description', 'parseinline' ) ) . Xml::element( 'td',
array(), $description ) ) . "\n" .
+ wfMessage(
'farmer-confirmsetting-description' )->parse() ) . Xml::element( 'td', array(),
$description ) ) . "\n" .
Xml::tags( 'tr', array(), Xml::tags(
'th', array(),
- wfMsgExt(
'farmer-confirmsetting-reason', 'parseinline' ) ) . Xml::element( 'td',
array(), $reason ) ) . "\n" .
+ wfMessage(
'farmer-confirmsetting-reason' )->parse() ) . Xml::element( 'td', array(),
$reason ) ) . "\n" .
Xml::closeElement( 'table' )
);
$wgOut->addWikiMsg(
'farmer-confirmsetting-text', $name, $title, $url );
@@ -192,9 +192,9 @@
'farmer-createwiki-form-text4'
);
- $formURL = wfMsgHTML( 'farmercreateurl' );
- $formSitename = wfMsgHTML( 'farmercreatesitename' );
- $formNextStep = wfMsgHTML( 'farmercreatenextstep' );
+ $formURL = wfMessage( 'farmercreateurl' )->escaped();
+ $formSitename = wfMessage( 'farmercreatesitename' )->escaped();
+ $formNextStep = wfMessage( 'farmercreatenextstep' )->escaped();
$token = htmlspecialchars( $wgUser->editToken() );
@@ -270,7 +270,7 @@
$wgOut->wrapWikiMsg( "== $1 ==\n$2", 'farmer-delete-title',
'farmer-delete-text' );
$select = new XmlSelect( 'wpWiki', false, $wgRequest->getVal(
'wpWiki' ) );
- $select->addOption( wfMsg( 'farmer-delete-form' ), '-1' );
+ $select->addOption( wfMessage( 'farmer-delete-form' )->text(),
'-1' );
foreach ( $list as $wiki ) {
if ( $wiki['name'] != $wgFarmer->getDefaultWiki() ) {
$name = $wiki['name'];
@@ -282,7 +282,7 @@
$wgOut->addHTML(
Xml::openElement( 'form', array( 'method' => 'post',
'name' => 'deleteWiki' ) ) . "\n" .
$select->getHTML() . "\n" .
- Xml::submitButton( wfMsg( 'farmer-delete-form-submit' )
) . "\n" .
+ Xml::submitButton( wfMessage(
'farmer-delete-form-submit' )->text() ) . "\n" .
Xml::closeElement( 'form' )
);
}
@@ -378,10 +378,10 @@
$wgOut->addWikiMsg(
'farmer-basic-permission-visitor-text' );
$doArray = array(
- array( 'read', wfMsg( 'right-read' ) ),
- array( 'edit', wfMsg( 'right-edit' ) ),
- array( 'createpage', wfMsg( 'right-createpage'
) ),
- array( 'createtalk', wfMsg( 'right-createtalk'
) )
+ array( 'read', wfMessage( 'right-read'
)->text() ),
+ array( 'edit', wfMessage( 'right-edit'
)->text() ),
+ array( 'createpage', wfMessage(
'right-createpage' )->text() ),
+ array( 'createtalk', wfMessage(
'right-createtalk' )->text() )
);
foreach ( $doArray as $arr ) {
@@ -392,21 +392,22 @@
$wgOut->addWikiMsg( 'farmer-basic-permission-user-text'
);
$doArray = array(
- array( 'read', wfMsg( 'right-read' ) ),
- array( 'edit', wfMsg( 'right-edit' ) ),
- array( 'createpage', wfMsg( 'right-createpage'
) ),
- array( 'createtalk', wfMsg( 'right-createtalk'
) ),
- array( 'move', wfMsg( 'right-move' ) ),
- array( 'upload', wfMsg( 'right-upload' ) ),
- array( 'reupload', wfMsg( 'right-reupload' ) ),
- array( 'minoredit', wfMsg( 'right-minoredit' ) )
+ array( 'read', wfMessage( 'right-read'
)->text() ),
+ array( 'edit', wfMessage( 'right-edit'
)->text() ),
+ array( 'createpage', wfMessage(
'right-createpage' )->text() ),
+ array( 'createtalk', wfMessage(
'right-createtalk' )->text() ),
+ array( 'move', wfMessage( 'right-move'
)->text() ),
+ array( 'upload', wfMessage( 'right-upload'
)->text() ),
+ array( 'reupload', wfMessage( 'right-reupload'
)->text() ),
+ array( 'minoredit', wfMessage(
'right-minoredit' )->text() )
);
foreach ( $doArray as $arr ) {
$this->_doPermissionInput( $wgOut, $wiki,
'user', $arr[0], $arr[1] );
}
- $wgOut->addHTML( '<input type="submit"
name="setPermissions" value="' . wfMsg( 'farmer-setpermission' ) . '" />' );
+ $wgOut->addHTML( '<input type="submit"
name="setPermissions" value="' .
+ wfMessage( 'farmer-setpermission' )->text() .
'" />' );
$wgOut->addHTML( "</form>\n\n\n" );
}
@@ -574,7 +575,9 @@
protected function _doPermissionInput( $wgOut, &$wiki, $group,
$permission, $description ) {
$value = $wiki->getPermission( $group, $permission );
- $wgOut->addHTML( '<p>' . $description . wfMsgExt(
'colon-separator', array( 'escapenoentities' ) ) );
+ $wgOut->addHTML( '<p>' . $description .
+ Sanitizer::escapeHtmlAllowEntities( wfMessage(
'colon-separator' )->text() ) );
+ wfMessage( 'eh' )->escaped()
$input = "<input type=\"radio\"
name=\"permission[$group][$permission]\" value=\"1\" ";
diff --git a/farmer.sql b/farmer.sql
index 9f79f94..bc99281 100644
--- a/farmer.sql
+++ b/farmer.sql
@@ -3,8 +3,8 @@
--
-- Store each wiki in the wiki farm
-CREATE TABLE farmer_wiki (
- fw_id INT NOT NULL auto_increment PRIMARY KEY,
+CREATE TABLE /*_*/farmer_wiki (
+ fw_id int NOT NULL PRIMARY KEY AUTO_INCREMENT,
fw_name VARCHAR(32) UNIQUE,
fw_title VARCHAR(255),
fw_description BLOB,
@@ -14,20 +14,20 @@
) /*$wgDBTableOptions*/;
-- Store information about each extension availabe in the farm
-CREATE TABLE farmer_extension (
- fe_id INT NOT NULL auto_increment PRIMARY KEY,
+CREATE TABLE /*_*/farmer_extension (
+ fe_id int NOT NULL PRIMARY KEY AUTO_INCREMENT,
fe_name VARCHAR(255) UNIQUE,
fe_description BLOB,
fe_path VARCHAR(255)
) /*$wgDBTableOptions*/;
-- Store relation beetween wiki and extensions
-CREATE TABLE farmer_wiki_extension (
+CREATE TABLE /*_*/farmer_wiki_extension (
fwe_wiki INT NOT NULL,
fwe_extension INT NOT NULL
) /*$wgDBTableOptions*/;
-CREATE INDEX farmer_wiki_extension_wiki ON farmer_wiki_extension ( fwe_wiki );
-CREATE INDEX farmer_wiki_extension_extension ON farmer_wiki_extension (
fwe_extension );
-ALTER TABLE farmer_wiki_extension
+CREATE INDEX /*i*/farmer_wiki_extension_wiki ON /*_*/farmer_wiki_extension (
fwe_wiki );
+CREATE INDEX /*i*/farmer_wiki_extension_extension ON
/*_*/farmer_wiki_extension ( fwe_extension );
+ALTER TABLE /*_*/farmer_wiki_extension
ADD CONSTRAINT farmer_wiki_extension_wiki_extension PRIMARY KEY (
fwe_wiki, fwe_extension );
--
To view, visit https://gerrit.wikimedia.org/r/185475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc7dd1b500aa0c3a118201fe2e33c8f1561a45cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Farmer
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
