You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2015/12/02 21:48:43 UTC

svn commit: r1717680 - /vcl/trunk/web/.ht-inc/image.php

Author: jfthomps
Date: Wed Dec  2 20:48:43 2015
New Revision: 1717680

URL: http://svn.apache.org/viewvc?rev=1717680&view=rev
Log:
VCL-921 - changing owner of an image can cause a duplicate key error on resourcegroupmembers

image.php - modified addImagePermissions: changed query that inserts into resourcegroupmembers to be "INSERT IGNORE" instead of just "INSERT"

Modified:
    vcl/trunk/web/.ht-inc/image.php

Modified: vcl/trunk/web/.ht-inc/image.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1717680&r1=1717679&r2=1717680&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Wed Dec  2 20:48:43 2015
@@ -1812,7 +1812,7 @@ class Image extends Resource {
 			updateResourcePrivs("image/newimages-{$ownerdata['login']}-$ownerid", $newnode, $adds, array());
 	
 		// add image to image group
-		$query = "INSERT INTO resourcegroupmembers "
+		$query = "INSERT IGNORE INTO resourcegroupmembers "
 		       . "(resourceid, resourcegroupid) "
 		       . "VALUES ($resourceid, $resourcegroupid)";
 		doQuery($query, 101);