Never assign a SafeString instance to a Model member (or hell will break loose).

This commit is contained in:
Andy Staudacher
2010-02-15 13:12:38 -08:00
parent 0b0c8cbb92
commit dcddc68f58
2 changed files with 5 additions and 5 deletions
@@ -287,7 +287,7 @@ class gallery_installer {
// Mark string for translation
$powered_by_string = t("Powered by <a href=\"%url\">%gallery_version</a>",
array("locale" => "root"));
module::set_var("gallery", "credits", $powered_by_string);
module::set_var("gallery", "credits", (string) $powered_by_string);
module::set_var("gallery", "simultaneous_upload_limit", 5);
module::set_var("gallery", "admin_area_timeout", 90 * 60);
module::set_version("gallery", 29);
+4 -4
View File
@@ -98,25 +98,25 @@ class user_installer {
DEFAULT CHARSET=utf8;");
$everybody = ORM::factory("group");
$everybody->name = t("Everybody", array("locale" => "root"));
$everybody->name = (string) t("Everybody", array("locale" => "root"));
$everybody->special = true;
$everybody->save();
$registered = ORM::factory("group");
$registered->name = t("Registered Users", array("locale" => "root"));
$registered->name = (string) t("Registered Users", array("locale" => "root"));
$registered->special = true;
$registered->save();
$guest = ORM::factory("user");
$guest->name = "guest";
$guest->full_name = t("Guest User", array("locale" => "root"));
$guest->full_name = (string) t("Guest User", array("locale" => "root"));
$guest->password = "";
$guest->guest = true;
$guest->save();
$admin = ORM::factory("user");
$admin->name = "admin";
$admin->full_name = t("Gallery Administrator", array("locale" => "root"));
$admin->full_name = (string) t("Gallery Administrator", array("locale" => "root"));
$admin->password = "admin";
$admin->email = "unknown@unknown.com";
$admin->admin = true;