http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99490
Revision: 99490
Author: jeroendedauw
Date: 2011-10-11 16:17:20 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
submission field should not be required
Modified Paths:
--------------
trunk/extensions/Contest/specials/SpecialContestSubmission.php
trunk/extensions/Contest/test/ContestValidationTests.php
Modified: trunk/extensions/Contest/specials/SpecialContestSubmission.php
===================================================================
--- trunk/extensions/Contest/specials/SpecialContestSubmission.php
2011-10-11 16:15:17 UTC (rev 99489)
+++ trunk/extensions/Contest/specials/SpecialContestSubmission.php
2011-10-11 16:17:20 UTC (rev 99490)
@@ -152,7 +152,7 @@
'wmf' => $data['contestant-wmf'],
'cv' => $data['contestant-cv'],
- 'submission' => $data['contestant-submission'],
+ 'submission' => trim( $data['contestant-submission'] ),
) );
return $contestant->writeToDB();
@@ -302,6 +302,12 @@
* @return true|string
*/
public static function validateSubmissionField( $value, $alldata = null
) {
+ $value = trim( $value );
+
+ if ( $value == '' ) {
+ return true;
+ }
+
$allowedPatterns = array(
// GitHub URLs such as
https://github.com/JeroenDeDauw/smwcon/tree/f9b26ec4ba1101b1f5d4ef76b7ae6ad3dabfb53b
'@^https://github\.com/[a-zA-Z0-9-]+/[a-zA-Z0-9_-]+/tree/[a-zA-Z0-9]{40}$@i'
Modified: trunk/extensions/Contest/test/ContestValidationTests.php
===================================================================
--- trunk/extensions/Contest/test/ContestValidationTests.php 2011-10-11
16:15:17 UTC (rev 99489)
+++ trunk/extensions/Contest/test/ContestValidationTests.php 2011-10-11
16:17:20 UTC (rev 99490)
@@ -24,6 +24,9 @@
'https://github.com/JeroenDeDauw/smwcon/tree/f9b26ec4ba1101b1f5d4ef76b7ae6ad3dabfb53ba'
=> false,
'https://github.com/JeroenDeDauw/smwc*/tree/f9b26ec4ba1101b1f5d4ef76b7ae6ad3dabfb53b'
=> false,
'in ur unit test, being quite silly' => false,
+ '
https://github.com/JeroenDeDauw/smwcon/tree/f9b26ec4ba1101b1f5d4ef76b7ae6ad3dabfb53b
' => true,
+ '' => true,
+ ' ' => true,
);
foreach ( $tests as $test => $isValdid ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
