summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/helpers/graphics.php30
1 files changed, 15 insertions, 15 deletions
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index bfc0085d..e7c5da68 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -166,7 +166,7 @@ class graphics_Core {
$movie_options_wrapper = new stdClass();
$movie_options_wrapper->movie_options = array();
module::event("movie_extract_frame", $input_file, $output_file,
- $movie_options_wrapper, $input_item);
+ $movie_options_wrapper, $input_item);
// If no output_file generated by events, run movie::extract_frame with movie_options
clearstatcache();
if (@filesize($output_file) == 0) {
@@ -215,7 +215,7 @@ class graphics_Core {
// Something went wrong rebuilding the image. Leave it dirty and move on.
// @todo we should handle this better.
Kohana_Log::add("error", "Caught exception rebuilding image: {$item->title}\n" .
- $e->getMessage() . "\n" . $e->getTraceAsString());
+ $e->getMessage() . "\n" . $e->getTraceAsString());
throw $e;
}
}
@@ -274,13 +274,13 @@ class graphics_Core {
$count = graphics::find_dirty_images_query()->count_records();
if ($count) {
site_status::warning(
- t2("One of your photos is out of date. <a %attrs>Click here to fix it</a>",
- "%count of your photos are out of date. <a %attrs>Click here to fix them</a>",
- $count,
- array("attrs" => html::mark_clean(sprintf(
- 'href="%s" class="g-dialog-link"',
- url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))),
- "graphics_dirty");
+ t2("One of your photos is out of date. <a %attrs>Click here to fix it</a>",
+ "%count of your photos are out of date. <a %attrs>Click here to fix them</a>",
+ $count,
+ array("attrs" => html::mark_clean(sprintf(
+ 'href="%s" class="g-dialog-link"',
+ url::site("admin/maintenance/start/gallery_task::rebuild_dirty_images?csrf=__CSRF__"))))),
+ "graphics_dirty");
}
}
@@ -334,12 +334,12 @@ class graphics_Core {
} else {
// ImageMagick & GraphicsMagick
$magick_kits = array(
- "imagemagick" => array(
- "name" => "ImageMagick", "binary" => "convert", "version_arg" => "-version",
- "version_regex" => "/Version: \S+ (\S+)/"),
- "graphicsmagick" => array(
- "name" => "GraphicsMagick", "binary" => "gm", "version_arg" => "version",
- "version_regex" => "/\S+ (\S+)/"));
+ "imagemagick" => array(
+ "name" => "ImageMagick", "binary" => "convert", "version_arg" => "-version",
+ "version_regex" => "/Version: \S+ (\S+)/"),
+ "graphicsmagick" => array(
+ "name" => "GraphicsMagick", "binary" => "gm", "version_arg" => "version",
+ "version_regex" => "/\S+ (\S+)/"));
// Loop through the kits
foreach ($magick_kits as $index => $settings) {
$path = system::find_binary(