http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88974
Revision: 88974
Author: happy-melon
Date: 2011-05-27 16:17:11 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Merge upstream a few other miscellaneous core hacks, mostly whitespace and type
hinting
Modified Paths:
--------------
trunk/extensions/SecurePoll/includes/entities/Election.php
trunk/extensions/SecurePoll/includes/main/Context.php
trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php
trunk/extensions/SecurePoll/includes/talliers/Tallier.php
trunk/extensions/SecurePoll/resources/SecurePoll.css
Modified: trunk/extensions/SecurePoll/includes/entities/Election.php
===================================================================
--- trunk/extensions/SecurePoll/includes/entities/Election.php 2011-05-27
16:14:09 UTC (rev 88973)
+++ trunk/extensions/SecurePoll/includes/entities/Election.php 2011-05-27
16:17:11 UTC (rev 88974)
@@ -176,6 +176,7 @@
$wgLang->timeanddate( $date )
);
}
+
# Blocked
$notBlocked = $this->getProperty( 'not-blocked' );
$isBlocked = !empty( $props['blocked'] );
Modified: trunk/extensions/SecurePoll/includes/main/Context.php
===================================================================
--- trunk/extensions/SecurePoll/includes/main/Context.php 2011-05-27
16:14:09 UTC (rev 88973)
+++ trunk/extensions/SecurePoll/includes/main/Context.php 2011-05-27
16:17:11 UTC (rev 88974)
@@ -61,7 +61,10 @@
}
}
- /** Get the ParserOptions instance */
+ /**
+ * Get the ParserOptions instance
+ * @return ParserOptions
+ */
function getParserOptions() {
if ( !$this->parserOptions ) {
$this->parserOptions = new ParserOptions;
@@ -69,7 +72,10 @@
return $this->parserOptions;
}
- /** Get the SecurePoll_Store instance */
+ /**
+ * Get the SecurePoll_Store instance
+ * @return SecurePoll_Store
+ */
function getStore() {
if ( !isset( $this->store ) ) {
$this->store = new $this->storeClass;
@@ -167,6 +173,7 @@
/**
* Get a SecurePoll_Random instance. This provides cryptographic random
* number generation.
+ * @return SecurePoll_Random
*/
function getRandom() {
if ( !$this->random ) {
@@ -238,6 +245,7 @@
/**
* Get a database object, or throw an exception if the current store
object
* does not support database operations.
+ * @return DatabaseBase
*/
function getDB() {
if ( !isset( $this->db ) ) {
Modified: trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php
===================================================================
--- trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php
2011-05-27 16:14:09 UTC (rev 88973)
+++ trunk/extensions/SecurePoll/includes/talliers/PluralityTallier.php
2011-05-27 16:17:11 UTC (rev 88974)
@@ -6,6 +6,11 @@
class SecurePoll_PluralityTallier extends SecurePoll_Tallier {
var $tally = array();
+ /**
+ * @param $context SecurePoll_Context
+ * @param $electionTallier SecurePoll_ElectionTallier
+ * @param $question SecurePoll_Question
+ */
function __construct( $context, $electionTallier, $question ) {
parent::__construct( $context, $electionTallier, $question );
foreach ( $question->getOptions() as $option ) {
Modified: trunk/extensions/SecurePoll/includes/talliers/Tallier.php
===================================================================
--- trunk/extensions/SecurePoll/includes/talliers/Tallier.php 2011-05-27
16:14:09 UTC (rev 88973)
+++ trunk/extensions/SecurePoll/includes/talliers/Tallier.php 2011-05-27
16:17:11 UTC (rev 88974)
@@ -29,6 +29,11 @@
}
}
+ /**
+ * @param $context SecurePoll_Context
+ * @param $electionTallier SecurePoll_ElectionTallier
+ * @param $question SecurePoll_Question
+ */
function __construct( $context, $electionTallier, $question ) {
$this->context = $context;
$this->question = $question;
Modified: trunk/extensions/SecurePoll/resources/SecurePoll.css
===================================================================
--- trunk/extensions/SecurePoll/resources/SecurePoll.css 2011-05-27
16:14:09 UTC (rev 88973)
+++ trunk/extensions/SecurePoll/resources/SecurePoll.css 2011-05-27
16:17:11 UTC (rev 88974)
@@ -47,21 +47,21 @@
}
.securepoll-table {
- margin: 1em 1em 1em 0;
- background: #f9f9f9;
- border: thin #aaa solid;
- border-collapse: collapse;
+ margin: 1em 1em 1em 0;
+ background: #f9f9f9;
+ border: thin #aaa solid;
+ border-collapse: collapse;
}
.securepoll-table th, .securepoll-table td {
- border: thin #aaa solid;
- padding: 0.4em;
+ border: thin #aaa solid;
+ padding: 0.4em;
}
.securepoll-table th {
- background: #f2f2f2;
- text-align: center;
+ background: #f2f2f2;
+ text-align: center;
}
.securepoll-table caption {
- font-weight: bold;
+ font-weight: bold;
}
.securepoll-ballot-table {
@@ -71,14 +71,14 @@
font-weight: bold;
text-align: center;
border: thin #999 solid;
- padding: 0 1.5em 0 1.5em;
+ padding: 0 1.5em;
}
.securepoll-ballot-table td {
text-align: center;
border-left: thin #999 solid;
border-right: thin #999 solid;
border-bottom: thin #bbb dotted;
- padding: 0 1.5em 0 1.5em;
+ padding: 0 1.5em;
}
.securepoll-ballot-table td.securepoll-ballot-optlabel { /* High specificity */
text-align: left;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
