Merge branch 'master' into dialog

gallery · Aug 1, 2010 · fc58003 · fc58003
2 parents f50151c + a5f7019
commit fc58003
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
@@ -72,8 +72,8 @@ public function __call($function, $args) {
       // necessary, it's easily resurrected.
 
       // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail
-      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a .jpg.
-      // So try some alternate types:
+      // for a movie.  In that case, the .flv, .mp4 or .m4v file would have been converted to a
+      // .jpg. So try some alternate types:
       if (preg_match('/.jpg$/', $path)) {
         foreach (array("flv", "mp4", "m4v") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path);
@@ -131,10 +131,7 @@ public function __call($function, $args) {
     } else {
       header("Content-Type: $item->mime_type");
     }
-
     Kohana::close_buffers(false);
-    $fd = fopen($file, "rb");
-    fpassthru($fd);
-    fclose($fd);
+    readfile($file);
   }
 }
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
@@ -18,7 +18,7 @@
     <a href="<?= url::site("admin/users/edit_user_form/{$user->id}") ?>"
       title="<?= t("Edit your profile")->for_html_attr() ?>"
       id="g-after-install-change-password-link"
-      class="g-button ui-state-default ui-corners-all">
+      class="g-button ui-state-default ui-corner-all">
       <?= t("Change password and email now") ?>
     </a>
     <script type="text/javascript">

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
@@ -282,6 +282,7 @@ static function _get_user_edit_form_admin($user) {
       "admin/users/edit_user/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $group = $form->group("edit_user")->label(t("Edit user"));
     $group->input("name")->label(t("Username"))->id("g-username")->value($user->name)
+      ->error_messages("required", t("A name is required"))
       ->error_messages("conflict", t("There is already a user with that username"))
       ->error_messages("length", t("This name is too long"));
     $group->input("full_name")->label(t("Full name"))->id("g-fullname")->value($user->full_name)