Revision: 43450
Author: jojo
Date: 2008-11-13 10:49:10 +0000 (Thu, 13 Nov 2008)
Log Message:
-----------
two checks guarding us against bugs in jQuery UI Sortable
Modified Paths:
--------------
trunk/extensions/Collection/Collection.body.php
trunk/extensions/Collection/Collection.php
Modified: trunk/extensions/Collection/Collection.body.php
===================================================================
--- trunk/extensions/Collection/Collection.body.php 2008-11-13 10:39:46 UTC
(rev 43449)
+++ trunk/extensions/Collection/Collection.body.php 2008-11-13 10:49:10 UTC
(rev 43450)
@@ -284,6 +284,9 @@
static function renameChapter( $index, $name ) {
$collection = $_SESSION['wsCollection'];
+ if ( $collection['items'][$index]['type'] != 'chapter ') {
+ return;
+ }
$collection['items'][$index]['title'] = $name;
$_SESSION['wsCollection'] = $collection;
self::touchSession();
Modified: trunk/extensions/Collection/Collection.php
===================================================================
--- trunk/extensions/Collection/Collection.php 2008-11-13 10:39:46 UTC (rev
43449)
+++ trunk/extensions/Collection/Collection.php 2008-11-13 10:49:10 UTC (rev
43450)
@@ -228,7 +228,13 @@
function wfAjaxCollectionSetSorting( $items_string ) {
$parsed = array();
parse_str( $items_string, &$parsed );
- Collection::setSorting( $parsed['item'] );
+ $items = array();
+ foreach ( $parsed['item'] as $s ) {
+ if ( is_numeric( $s ) ) {
+ $items[] = intval( $s );
+ }
+ }
+ Collection::setSorting( $items );
return wfAjaxCollectionGetItemList();
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
