From e2a2a5ce812c249b46d56ed2f738162e3f4cd09b Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 19 Jan 2013 00:52:13 +0100
Subject: #1944 - Fix possible warnings in
 legal_file::get_photo_types_by_extension and
 legal_file::get_movie_types_by_extension. Added unit tests for these two
 functions, too.

---
 modules/gallery/helpers/legal_file.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index e24aca36..70c07065 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -25,13 +25,14 @@ class legal_file_Core {
    *
    * @param string $extension (opt.) - return MIME of extension; if not given, return complete array
    */
-  static function get_photo_types_by_extension($extension=NULL) {
+  static function get_photo_types_by_extension($extension=null) {
     $types_by_extension_wrapper = new stdClass();
     $types_by_extension_wrapper->types_by_extension = array(
       "jpg" => "image/jpeg", "jpeg" => "image/jpeg", "gif" => "image/gif", "png" => "image/png");
     module::event("photo_types_by_extension", $types_by_extension_wrapper);
     if ($extension) {
       // return matching MIME type
+      $extension = strtolower($extension);
       if (isset($types_by_extension_wrapper->types_by_extension[$extension])) {
         return $types_by_extension_wrapper->types_by_extension[$extension];
       } else {
@@ -50,13 +51,14 @@ class legal_file_Core {
    *
    * @param string $extension (opt.) - return MIME of extension; if not given, return complete array
    */
-  static function get_movie_types_by_extension($extension=NULL) {
+  static function get_movie_types_by_extension($extension=null) {
     $types_by_extension_wrapper = new stdClass();
     $types_by_extension_wrapper->types_by_extension = array(
       "flv" => "video/x-flv", "mp4" => "video/mp4", "m4v" => "video/x-m4v");
     module::event("movie_types_by_extension", $types_by_extension_wrapper);
     if ($extension) {
       // return matching MIME type
+      $extension = strtolower($extension);
       if (isset($types_by_extension_wrapper->types_by_extension[$extension])) {
         return $types_by_extension_wrapper->types_by_extension[$extension];
       } else {
-- 
cgit v1.2.3