diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-08-09 11:13:41 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-09 11:13:41 -0700 |
| commit | d3ea304f7d03cd1c98e3c93fa070236aa3dca684 (patch) | |
| tree | 566db235b0203a6f4690c516cfff21aef2d5f4ad | |
| parent | 7aac471b828d4405b3fb0d736a06a5b92875883e (diff) | |
| parent | 5c25973ee8f9601353917767d31f0af49cd93737 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
| -rw-r--r-- | modules/gallery/views/after_install.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/after_install_loader.html.php | 2 | ||||
| -rw-r--r-- | modules/user/models/user.php | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/views/after_install.html.php b/modules/gallery/views/after_install.html.php index 41e600fb..bfce46f0 100644 --- a/modules/gallery/views/after_install.html.php +++ b/modules/gallery/views/after_install.html.php @@ -16,7 +16,7 @@ title="<?= t("Edit Your Profile") ?>" id="gAfterInstallChangePasswordLink" class="gButtonLink ui-state-default ui-corners-all"><?= t("Change Password Now") ?></a> <script> - $("#gAfterInstallChangePasswordLink").gallery_dialog({immediate: true}); + $("#gAfterInstallChangePasswordLink").gallery_dialog(); </script> </p> diff --git a/modules/gallery/views/after_install_loader.html.php b/modules/gallery/views/after_install_loader.html.php index baf91eed..54484963 100644 --- a/modules/gallery/views/after_install_loader.html.php +++ b/modules/gallery/views/after_install_loader.html.php @@ -3,5 +3,5 @@ title="<?= t("Welcome to Gallery 3") ?>" href="<?= url::site("after_install") ?>"/> <script type="text/javascript"> - $(document).ready(function(){openDialog($("#gAfterInstall"));}); + $(document).ready(function(){$("#gAfterInstall").gallery_dialog({immediate: true});}); </script> diff --git a/modules/user/models/user.php b/modules/user/models/user.php index 4b43adff..55562f34 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -25,6 +25,7 @@ class User_Model extends ORM { "full_name" => "length[0,255]", "email" => "valid_email|length[1,255]", "password" => "length[1,40]", + "url" => "valid_url", "locale" => "length[2,10]"); public function __set($column, $value) { |