public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Romain LE DISEZ 2010-10-26 23:29:30 +02:00
commit a1f8743ee2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3.0/modules/basket/helpers/basket_installer.php
View File

@ -68,7 +68,7 @@ class basket_installer
PRIMARY KEY (`id`))
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
$db->query("CREATE TABLE IF NOT EXISTS `ipn_messages` (
$db->query("CREATE TABLE IF NOT EXISTS {ipn_messages} (
`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`date` int(11) NOT NULL,
`key` varchar(20) NOT NULL,
@ -220,5 +220,6 @@ Thanks");
$db->query("DROP TABLE IF EXISTS {item_products}");
$db->query("DROP TABLE IF EXISTS {postage_bands}");
$db->query("DROP TABLE IF EXISTS {orders}");
$db->query("DROP TABLE IF EXISTS {ipn_messages}");
}
}

2
3.0/modules/favourites/views/save_dialog.html.php
View File

@ -8,4 +8,4 @@ if (favourites_configuration::isEmailAdmin()){
else{
?>An e-mail will be sent to you with a link to this list.<?
}
?><div id="basketForm"><?= $form ?></div></div>
?><div id="favourites-save-form"><?= $form ?></div></div>

9
3.0/modules/user_homes/helpers/user_homes_event.php
View File

@ -100,9 +100,10 @@ class user_homes_event_Core {
*/
static function user_edit_form_admin_completed($user, $form) {
$home = ORM::factory("user_home")->where("id", "=", $user->id)->find();
$home->id = $user->id;
$home->home = $form->edit_user->user_home->value;
$home->save();
if ($home->loaded()) {
$home->home = $form->edit_user->user_home->value;
$home->save();
}
}
@ -257,7 +258,7 @@ class user_homes_event_Core {
// create a user based on username
$user = identity::create_user($username, $username, $password, $username."@unknown.com");
identity::add_user_to_group($user,$group->id);
identity::add_user_to_group($user,$group);
// create user home
$home = ORM::factory("user_home")->where("id", "=", $user->id)->find();