Revision: 51884
Author: jojo
Date: 2009-06-15 11:40:12 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
use return codes in removeArticle() etc.
Modified Paths:
--------------
trunk/extensions/Collection/Collection.body.php
trunk/extensions/Collection/Collection.i18n.php
Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php 2009-06-15 11:36:23 UTC
(rev 51883)
+++ trunk/extensions/Collection/Collection.body.php 2009-06-15 11:40:12 UTC
(rev 51884)
@@ -81,14 +81,20 @@
if ( !$title ) {
return;
}
- self::removeArticle( $title, $oldid );
- if ( $oldid == 0 ) {
- $redirectURL = $title->getFullURL();
+ if ( self::removeArticle( $title, $oldid ) ) {
+ if ( $oldid == 0 ) {
+ $redirectURL =
$title->getFullURL();
+ } else {
+ $redirectURL =
$title->getFullURL( 'oldid=' . $oldid );
+ }
+ $wgUser->invalidateCache();
+ $wgOut->redirect( $redirectURL );
} else {
- $redirectURL = $title->getFullURL(
'oldid=' . $oldid );
+ $wgOut->showErrorPage(
+
'coll-couldnotremovearticle_title',
+ 'coll-couldnotremovearticle_msg'
+ );
}
- $wgUser->invalidateCache();
- $wgOut->redirect( $redirectURL );
return;
case 'clear_collection/':
CollectionSession::clearCollection();
@@ -373,7 +379,7 @@
static function removeArticle( $title, $oldid=0 ) {
if ( !CollectionSession::hasSession() ) {
- return;
+ return false;
}
$collection = $_SESSION['wsCollection'];
$index = CollectionSession::findArticle(
$title->getPrefixedText(), $oldid );
@@ -382,6 +388,7 @@
}
$_SESSION['wsCollection'] = $collection;
CollectionSession::touchSession();
+ return true;
}
static function addCategoryFromName( $name ) {
@@ -439,17 +446,18 @@
static function removeItem( $index ) {
if ( !CollectionSession::hasSession() ) {
- return;
+ return false;
}
$collection = $_SESSION['wsCollection'];
array_splice( $collection['items'], $index, 1 );
$_SESSION['wsCollection'] = $collection;
CollectionSession::touchSession();
+ return true;
}
static function moveItem( $index, $delta ) {
if ( !CollectionSession::hasSession() ) {
- return;
+ return false;
}
$collection = $_SESSION['wsCollection'];
$saved = $collection['items'][$index + $delta];
@@ -457,6 +465,7 @@
$collection['items'][$index] = $saved;
$_SESSION['wsCollection'] = $collection;
CollectionSession::touchSession();
+ return true;
}
static function setSorting( $items ) {
Modified: trunk/extensions/Collection/Collection.i18n.php
===================================================================
--- trunk/extensions/Collection/Collection.i18n.php 2009-06-15 11:36:23 UTC
(rev 51883)
+++ trunk/extensions/Collection/Collection.i18n.php 2009-06-15 11:40:12 UTC
(rev 51884)
@@ -35,6 +35,8 @@
'coll-unknown_subpage_text' => 'This subpage of
[[Special:Book|Book]] does not exist',
'coll-couldnotaddarticle_title' => 'Could not add article',
'coll-couldnotaddarticle_msg' => 'The article could not be added.',
+ 'coll-couldnotremovearticle_title' => 'Could not remove article',
+ 'coll-couldnotremovearticle_msg' => 'The article could not be
removed.',
'coll-download_as' => 'Download as $1',
'coll-noscript_text' => '<h1>JavaScript is required!</h1>
<strong>Your browser does not support JavaScript or JavaScript has been turned
off.
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
