From 12f25a7e55d5aab4c4170eaa3bcb761cf5514be2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 8 Aug 2009 21:26:55 -0700
Subject: Fix the after_install loader to immediately open the "Welcome to
 Gallery 3!" dialog, but not immediately open the "change your password"
 dialog.

---
 modules/gallery/views/after_install.html.php        | 2 +-
 modules/gallery/views/after_install_loader.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

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>
-- 
cgit v1.2.3


From 5c25973ee8f9601353917767d31f0af49cd93737 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 9 Aug 2009 00:02:13 -0700
Subject: Require a valid url for users.  Fixes ticket #612.

---
 modules/user/models/user.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

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) {
-- 
cgit v1.2.3