Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch

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>
 

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>

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) {