[mb-commits] r9851 - mb_server/trunk/htdocs/edit/relationship

[root at musicbrainz.org]

Author: robert
Date: 2008-05-27 22:08:50 +0000 (Tue, 27 May 2008)
New Revision: 9851

Modified:
   mb_server/trunk/htdocs/edit/relationship/addcc.html
Log:
Fixes #3677


Modified: mb_server/trunk/htdocs/edit/relationship/addcc.html
===================================================================
--- mb_server/trunk/htdocs/edit/relationship/addcc.html	2008-05-25 06:51:32 UTC (rev 9850)
+++ mb_server/trunk/htdocs/edit/relationship/addcc.html	2008-05-27 22:08:50 UTC (rev 9851)
@@ -54,11 +54,26 @@
     return undef;
 }
 
-my $obj;
-$obj = MusicBrainz::Server::LinkEntity->newFromTypeAndId(
-    $mb->{DBH},
-    $type, $id
-) or $obj = undef;
+# If we're passed an MBID, load the rowid and proceed as usual
+if (MusicBrainz::Server::Validation::IsGUID($id))
+{
+	my $obj = $m->comp("/comp/load" . ($type == "album" ? "release" : $type), $mb, $id);
+	$id = $obj->GetId();
+}
+
+my $obj = undef;
+if (MusicBrainz::Server::Validation::IsNonNegInteger($id))
+{
+	$obj = MusicBrainz::Server::LinkEntity->newFromTypeAndId(
+		$mb->{DBH},
+		$type, $id);
+}
+elsif (MusicBrainz::Server::Validation::IsGUID($id))
+{
+	$obj = MusicBrainz::Server::LinkEntity->newFromTypeAndMBId(
+		$mb->{DBH},
+		$type, $id);
+}
 if (!defined $obj)
 {
 	</%perl>