Index: creativecommons.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/creativecommons/creativecommons.module,v
retrieving revision 1.9.2.73
diff -u -r1.9.2.73 creativecommons.module
--- creativecommons.module	11 Feb 2010 22:05:23 -0000	1.9.2.73
+++ creativecommons.module	23 Feb 2010 10:26:19 -0000
@@ -1968,8 +1962,18 @@
  * Save license/node relationship in database
  */
 function creativecommons_save($node, $op) {
-  //TODO: shouldn't be using $_POST... what's the drupal way to do this? use submit instead?
-  $cc = new creativecommons_license($_POST['creativecommons']['select_license_form']['cc_license_uri'], $_POST['creativecommons']['metadata']);
+  
+  // form submits data in creativecommons, while node_load stores it in cc
+  if (isset($node->creativecommons)) {
+    $cc_license_uri = $node->creativecommons['select_license_form']['cc_license_uri'];
+    $metadata = $node->creativecommons['metadata'];
+  }
+  else {
+    $cc_license_uri = $node->cc->uri;
+    $metadata = $node->cc->metadata;
+  }
+  
+  $cc = new creativecommons_license($cc_license_uri, $metadata);
   $cc->save($node->nid, $op);
 }
 

