summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
authorshadlaws <shad@shadlaws.com>2013-01-24 12:03:05 +0100
committershadlaws <shad@shadlaws.com>2013-01-24 12:03:05 +0100
commit031dd3bd6f279b5ddec6f08ff11e0acee521a5fe (patch)
tree6e8988e28d0eff76214834d644c8438db5a11cba /modules/gallery/helpers
parent3e451d6edc6ab3586ef730e4458ca0b2d55f5170 (diff)
#1960 - Add unit test to look for extra spaces at end of line
- Added no_extra_spaces_at_end_of_line_test to File_Structure_Test. - Updated Gallery_Filters to exclude testing code that isn't ours. - Removed existing extra spaces. New test now passes.
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/gallery_installer.php6
-rw-r--r--modules/gallery/helpers/movie.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 91c785f6..fe651a4e 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -718,14 +718,14 @@ class gallery_installer {
if ($version == 50) {
// In v51, we added a lock_timeout variable so that administrators could edit the time out
- // from 1 second to a higher variable if their system runs concurrent parallel uploads for
+ // from 1 second to a higher variable if their system runs concurrent parallel uploads for
// instance.
module::set_var("gallery", "lock_timeout", 1);
module::set_version("gallery", $version = 51);
}
if ($version == 51) {
- // In v52, we added functions to the legal_file helper that map photo and movie file
+ // In v52, we added functions to the legal_file helper that map photo and movie file
// extensions to their mime types (and allow extension of the list by other modules). During
// this process, we correctly mapped m4v files to video/x-m4v, correcting a previous error
// where they were mapped to video/mp4. This corrects the existing items.
@@ -736,7 +736,7 @@ class gallery_installer {
->execute();
module::set_version("gallery", $version = 52);
}
-
+
if ($version == 52) {
// In v53, we added the ability to change the default time used when extracting frames from
// movies. Previously we hard-coded this at 3 seconds, so we use that as the default.
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index fb3fab80..7e6a2e55 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -82,7 +82,7 @@ class movie_Core {
// extract frame at start_time, unless movie is too short
$start_time_arg = ($duration >= $start_time + 0.1) ?
"-ss " . movie::seconds_to_hhmmssdd($start_time) : "";
-
+
$input_args = isset($movie_options["input_args"]) ? $movie_options["input_args"] : "";
$output_args = isset($movie_options["output_args"]) ? $movie_options["output_args"] : "";
@@ -164,7 +164,7 @@ class movie_Core {
* Return the time/duration formatted in hh:mm:ss.dd from a number of seconds.
* Useful for inputs to ffmpeg.
*
- * Note that this is similar to date("H:i:s", mktime(0,0,$seconds,0,0,0,0)), but unlike this
+ * Note that this is similar to date("H:i:s", mktime(0,0,$seconds,0,0,0,0)), but unlike this
* approach avoids potential issues with time zone and DST mismatch and/or using deprecated
* features (the last argument of mkdate above, which disables DST, is deprecated as of PHP 5.3).
*/
@@ -172,7 +172,7 @@ class movie_Core {
return sprintf("%02d:%02d:%05.2f", floor($seconds / 3600), floor(($seconds % 3600) / 60),
floor(100 * $seconds % 6000) / 100);
}
-
+
/**
* Return the number of seconds from a time/duration formatted in hh:mm:ss.dd.
* Useful for outputs from ffmpeg.