Commit 804436bc authored by Martijn Vermeulen's avatar Martijn Vermeulen
Browse files

Applied patches for issues #2630478 and #2630474.

parent 13568d69

rijksvideo.field.inc

+1 −1
Changes for rijksvideo.field.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ function rijksvideo_field_formatter_view($object_type, $object, $field, $instanc 
              if ($file) {

                $caption = $file;

                $downloads[] = array(

                  'mime' => 'text/' . _rijksvideo_get_file_extention($file),

                  'mime' => 'text/' . _rijksvideo_get_file_extension($file),

                  'type' => t('Caption'),

                  'uri' => $file,

                  'label' => t('Subtitle'),

rijksvideo.module

+4 −3
Changes for rijksvideo.module: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -136,15 +136,16 @@ function rijksvideo_preprocess_rijksvideo(&$variables) { 
/**

 * Retrieve the extension of a given file.

 */

function _rijksvideo_get_file_extention($filename) {

  return end(explode('.', $filename));

function _rijksvideo_get_file_extension($filename) {

  $filename_array = explode('.', $filename);

  return end($filename_array);

}



/**

 * Retrieve the icon of a given file extension.

 */

function _rijksvideo_get_file_icon($file) {

  $extension = _rijksvideo_get_file_extention($file);

  $extension = _rijksvideo_get_file_extension($file);

  // Since there is no icon for webm use mp4

  $extension = ($extension == 'webm' ? 'mp4' : $extension );

  return theme('image', array('path' => '//roimg.nl/presentation/shared-ro/images/icon-' . $extension . '.png'));

rijksvideo.theme.inc

+2 −2
Changes for rijksvideo.theme.inc: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ function theme_rijksvideo_file_download($variables) { 
      '@type' => $download['type'],

      '@date' => format_date($download['date'], 'short'),

      '!icon' => _rijksvideo_get_file_icon($download['uri']),

      '@extension' => _rijksvideo_get_file_extention($download['uri']),

      '@extension' => _rijksvideo_get_file_extension($download['uri']),

      '@duration' => $download['duration'],

      '@size' => format_size($download['size']),

    )) . '</span>';
@@ -31,7 +31,7 @@ function theme_rijksvideo_file_download($variables) { 
      '@type' => $download['type'],

      '@date' => format_date($download['date'], 'short'),

      '!icon' => _rijksvideo_get_file_icon($download['uri']),

      '@extension' => _rijksvideo_get_file_extention($download['uri']),

      '@extension' => _rijksvideo_get_file_extension($download['uri']),

    )) . '</span>';

  }

  $linktext .= ' ' . $metatext;