Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on.

This commit is contained in:
j2blake 2012-09-07 15:41:57 +00:00
parent 07b73bbc22
commit 0a72583712
3 changed files with 14 additions and 4 deletions

View file

@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `orng_app_registry` (
`appid` int(11) NOT NULL,
`personId` varchar(255) NOT NULL,
`createdDT` datetime NOT NULL,
PRIMARY KEY (`appid`)
PRIMARY KEY (`appid`, `personId` )
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-- --------------------------------------------------------