diff options
| author | Nick Palmer <nick@sluggardy.net> | 2007-11-19 10:52:43 +0000 |
|---|---|---|
| committer | Nick Palmer <nick@sluggardy.net> | 2007-11-19 10:52:43 +0000 |
| commit | 7f776cef00a6adcd5b147a64aa483eeebd8cc326 (patch) | |
| tree | b5c739ea2394d3bd0db82642ef373855afea7417 /edit_pigeonholes.php | |
| parent | de9ae501e8bbed98bc65ecc2ecf63f1216586bf5 (diff) | |
| download | pigeonholes-7f776cef00a6adcd5b147a64aa483eeebd8cc326.tar.gz pigeonholes-7f776cef00a6adcd5b147a64aa483eeebd8cc326.tar.bz2 pigeonholes-7f776cef00a6adcd5b147a64aa483eeebd8cc326.zip | |
Fixed dismember bug and add dismember link to nav path for users with permission.
Diffstat (limited to 'edit_pigeonholes.php')
| -rw-r--r-- | edit_pigeonholes.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/edit_pigeonholes.php b/edit_pigeonholes.php index 34ac79a..d067c13 100644 --- a/edit_pigeonholes.php +++ b/edit_pigeonholes.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_pigeonholes/edit_pigeonholes.php,v 1.30 2007/10/10 18:07:17 wjames5 Exp $ + * $Header: /cvsroot/bitweaver/_bit_pigeonholes/edit_pigeonholes.php,v 1.31 2007/11/19 10:52:42 nickpalmer Exp $ * * Copyright ( c ) 2004 bitweaver.org * Copyright ( c ) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * - * $Id: edit_pigeonholes.php,v 1.30 2007/10/10 18:07:17 wjames5 Exp $ + * $Id: edit_pigeonholes.php,v 1.31 2007/11/19 10:52:42 nickpalmer Exp $ * @package pigeonholes * @subpackage functions */ @@ -88,11 +88,15 @@ if( !empty( $_REQUEST['action'] ) || isset( $_REQUEST["confirm"] ) ) { } if( $_REQUEST['action'] == 'dismember' && !empty( $_REQUEST['pigeonhole_content_id'] ) && !empty( $_REQUEST['parent_id'] ) ) { - if( $gContent->expungePigeonholeMember( array( 'parent_id' => $_REQUEST['pigeonhole_content_id'], 'member_id' => $_REQUEST['parent_id'] ) ) ) { + if( $gContent->expungePigeonholeMember( array( 'parent_id' => $_REQUEST['parent_id'], 'member_id' => $_REQUEST['pigeonhole_content_id'] ) ) ) { $feedback['success'] = tra( 'The item was successfully removed' ); } else { $feedback['error'] = tra( 'The item could not be removed' ); } + // Have we been asked to return somewhere else? + if (!empty($_REQUEST['return_uri'])) { + bit_redirect($_REQUEST['return_uri']); + } // used to avoid displaying edit form unset( $_REQUEST['action'] ); } |