Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into dialog

  • Loading branch information...
commit fc580037e797fad48b49fcffa7aa69dca8761972 2 parents f50151c + a5f7019
@talmdal talmdal authored
View
9 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);
}
}
View
2  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">
View
1  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)
Please sign in to comment.
Something went wrong with that request. Please try again.