From e48e362d05138c33aa49ebfbcb8549f0350fb974 Mon Sep 17 00:00:00 2001
From: Alexander O'Neill <al.oneill@unb.ca>
Date: Thu, 10 Feb 2011 21:30:12 -0400
Subject: [PATCH] Merge changes from master

---
 formClass.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/formClass.inc b/formClass.inc
index eddedabf..cdc5c578 100644
--- a/formClass.inc
+++ b/formClass.inc
@@ -708,8 +708,7 @@ class formClass {
           '#weight' => '-1',
           '#description' => t('Datastream IDs defined by the content model.'),
       );
-
-      $form['stream_id']['#options'] = array_combine($unused_dsids, $unused_dsids);
+      $form['stream_id']['#options'] = $dsidsForForm;
     } 
     else {
       $form['stream_id'] = array(