summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-02-18 16:20:23 -0800
committerBharat Mediratta <bharat@menalto.com>2010-02-18 16:20:23 -0800
commit99c131e845b5bbfa22b93fa783b5ce671bc27e40 (patch)
tree066f6e9ea1057d156b3b0aa89e2d099d04943538 /modules
parentd3e07f8a97627a500bad07ce0a68ac91a766ccd4 (diff)
Revert "Never assign a SafeString instance to a Model member (or hell will break loose)."
This reverts commit dcddc68f58dac2f0fe71f5a00ea4af32618efa13.
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/helpers/gallery_installer.php2
-rw-r--r--modules/user/helpers/user_installer.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index b594ddcf..45d991af 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -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", (string) $powered_by_string);
+ module::set_var("gallery", "credits", $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);
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 9e757ecd..c57ad010 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -98,25 +98,25 @@ class user_installer {
DEFAULT CHARSET=utf8;");
$everybody = ORM::factory("group");
- $everybody->name = (string) t("Everybody", array("locale" => "root"));
+ $everybody->name = t("Everybody", array("locale" => "root"));
$everybody->special = true;
$everybody->save();
$registered = ORM::factory("group");
- $registered->name = (string) t("Registered Users", array("locale" => "root"));
+ $registered->name = t("Registered Users", array("locale" => "root"));
$registered->special = true;
$registered->save();
$guest = ORM::factory("user");
$guest->name = "guest";
- $guest->full_name = (string) t("Guest User", array("locale" => "root"));
+ $guest->full_name = t("Guest User", array("locale" => "root"));
$guest->password = "";
$guest->guest = true;
$guest->save();
$admin = ORM::factory("user");
$admin->name = "admin";
- $admin->full_name = (string) t("Gallery Administrator", array("locale" => "root"));
+ $admin->full_name = t("Gallery Administrator", array("locale" => "root"));
$admin->password = "admin";
$admin->email = "unknown@unknown.com";
$admin->admin = true;