http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65647
Revision: 65647
Author: jeroendedauw
Date: 2010-04-28 23:24:52 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Fixed 2 small bugs
Modified Paths:
--------------
trunk/extensions/Storyboard/Storyboard.i18n.php
trunk/extensions/Storyboard/api/ApiStoryExists.php
trunk/extensions/Storyboard/specials/StorySubmission/StorySubmission_body.php
Modified: trunk/extensions/Storyboard/Storyboard.i18n.php
===================================================================
--- trunk/extensions/Storyboard/Storyboard.i18n.php 2010-04-28 23:16:52 UTC
(rev 65646)
+++ trunk/extensions/Storyboard/Storyboard.i18n.php 2010-04-28 23:24:52 UTC
(rev 65647)
@@ -57,6 +57,7 @@
'storyboard-submissionincomplete' => 'Submission failed',
'storyboard-alreadyexists' => '"$1" is already taken.',
'storyboard-changetitle' => 'Change the title.',
+ 'storyboard-notsubmitted' => 'Authentication failed, no story has been
saved.',
// Story review
'storyreview' => 'Story review',
Modified: trunk/extensions/Storyboard/api/ApiStoryExists.php
===================================================================
--- trunk/extensions/Storyboard/api/ApiStoryExists.php 2010-04-28 23:16:52 UTC
(rev 65646)
+++ trunk/extensions/Storyboard/api/ApiStoryExists.php 2010-04-28 23:24:52 UTC
(rev 65647)
@@ -46,13 +46,15 @@
$this->dieUsageMsg( array( 'missingparam', 'storytitle'
) );
}
+ $exists = self::StoryExists( $params );
+
$result = array(
- 'exists' => self::StoryExists( $params )
+ 'exists' => $exists
);
// Just return true or false.
// If there is a way of doing this via the API, this should
oviously be changed.
- die( $story == false ? 'true' : 'false' );
+ die( $exists ? 'false' : 'true' );
//$this->getResult()->setIndexedTagName( $result, 'story' );
//$this->getResult()->addValue( null, $this->getModuleName(),
$result );
Modified:
trunk/extensions/Storyboard/specials/StorySubmission/StorySubmission_body.php
===================================================================
---
trunk/extensions/Storyboard/specials/StorySubmission/StorySubmission_body.php
2010-04-28 23:16:52 UTC (rev 65646)
+++
trunk/extensions/Storyboard/specials/StorySubmission/StorySubmission_body.php
2010-04-28 23:24:52 UTC (rev 65647)
@@ -21,9 +21,9 @@
public function execute( $title ) {
global $wgOut, $wgRequest, $wgUser;
-
+
if ( $wgRequest->wasPosted() &&
- !( $wgUser->isLoggedIn() && $wgUser->matchEditToken(
$wgRequest->getVal( 'wpStoryEditToken' ) ) )
+ ( $wgUser->matchEditToken( $wgRequest->getVal(
'wpStoryEditToken' ) ) || !$wgUser->isLoggedIn() )
) {
$title = $wgRequest->getText( 'storytitle' );
@@ -36,6 +36,7 @@
$this->displayResult( !$exists, $title );
} else {
+ $wgOut->setPageTitle( wfMsg( 'storyboard-notsubmitted'
) );
$wgOut->returnToMain();
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
