Browse files

Merge branch 'master' of github.com:gallery/gallery3

  • Loading branch information...
2 parents fb5503b + 6afc5cc commit 16bf1d18adc870d07cd83e40bc9fe5dbe5400fad @bharat bharat committed Feb 23, 2010
View
11 modules/g2_import/helpers/g2_import.php
@@ -304,20 +304,27 @@ static function import_user(&$queue) {
if ($user) {
$message = t("Loaded existing user: '%name'.", array("name" => $user->name));
} else {
+ $email = $g2_user->getEmail();
+ if (empty($email) || !valid::email($email)) {
+ $email = "unknown@unknown.com";
+ }
$user = identity::create_user($g2_user->getUsername(), $g2_user->getfullname(),
// Note: The API expects a password in cleartext.
// Just use the hashed password as an unpredictable
// value here. The user will have to reset the password.
- $g2_user->getHashedPassword(), $g2_user->getEmail());
+ $g2_user->getHashedPassword(), $email);
if (class_exists("User_Model") && $user instanceof User_Model) {
// This will work if G2's password is a PasswordHash password as well.
$user->hashed_password = $g2_user->getHashedPassword();
}
$message = t("Created user: '%name'.", array("name" => $user->name));
+ if ($email == "unknown@unknown.com") {
+ $message .= t("\n\tFixed invalid email (was '%invalid_email')",
+ array("invalid_email" => $g2_user->getEmail()));
+ }
}
$user->hashed_password = $g2_user->getHashedPassword();
- $user->email = $g2_user->getEmail() ? $g2_user->getEmail() : "unknown@unknown.com";
$user->locale = $g2_user->getLanguage();
foreach ($g2_groups as $g2_group_id => $g2_group_name) {
if ($g2_group_id == $g2_admin_group_id) {
View
3 modules/gallery/libraries/Gallery_I18n.php
@@ -166,7 +166,8 @@ private static function load_translations($locale) {
$cache_key = "translation|" . $locale;
$cache = Cache::instance();
$translations = $cache->get($cache_key);
- if (empty($translations)) {
+ if (!isset($translations) || !is_array($translations)) {
+ $translations = array();
foreach (db::build()
->select("key", "translation")
->from("incoming_translations")
View
2 modules/organize/js/organize.js
@@ -270,7 +270,7 @@
if ($(event.currentTarget).hasClass("ui-state-focus")) {
return;
}
- var parent = $(event.currentTarget).parents(".g-organize-branch");
+ var parent = $(event.currentTarget).parents(".g-organize-album");
if ($(parent).hasClass("g-view-only")) {
return;
}

0 comments on commit 16bf1d1

Please sign in to comment.