[mb-commits] r9852 - mb_server/trunk/htdocs/edit/album

[root at musicbrainz.org]

Author: robert
Date: 2008-05-27 22:16:21 +0000 (Tue, 27 May 2008)
New Revision: 9852

Modified:
   mb_server/trunk/htdocs/edit/album/add.html
Log:
Fixes #3676


Modified: mb_server/trunk/htdocs/edit/album/add.html
===================================================================
--- mb_server/trunk/htdocs/edit/album/add.html	2008-05-27 22:08:50 UTC (rev 9851)
+++ mb_server/trunk/htdocs/edit/album/add.html	2008-05-27 22:16:21 UTC (rev 9852)
@@ -58,7 +58,9 @@
 		return;
 	}
 
-	MusicBrainz::Server::Validation::IsNonNegInteger($artistid) && $artistid
+
+	(MusicBrainz::Server::Validation::IsGUID($artistid) ||
+	MusicBrainz::Server::Validation::IsNonNegInteger($artistid)) && $artistid
 		or return $m->comp("/comp/badargs", 0, 1);
 
 	$artistid != &ModDefs::DARTIST_ID
@@ -71,13 +73,21 @@
 	my $mb = $m->comp("/comp/dblogin");
 
 	my $ar = MusicBrainz::Server::Artist->new($mb->{DBH});
-	$ar->SetId($artistid);
+	if (MusicBrainz::Server::Validation::IsGUID($artistid))
+    {
+	    $ar->SetMBId($artistid);
+	}
+	else
+	{
+	    $ar->SetId($artistid);
+	}
 	$ar->LoadFromId
 		or return $m->comp(
 			"/comp/error",
 			"Artist #$artistid does not exist",
 			0, 1,
 		);
+    $artistid = $ar->GetId();
 
 </%perl>