From 573448e75a06c619867009246f7d8c0740f8776c Mon Sep 17 00:00:00 2001 From: Andrew Berry Date: Mon, 13 Jun 2011 10:52:52 -0400 Subject: [PATCH] Issue #1187006: Fix detecting an invalid version of the jPlayer library. --- includes/jplayer.admin.inc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/includes/jplayer.admin.inc b/includes/jplayer.admin.inc index 135179d..cf81bef 100644 --- a/includes/jplayer.admin.inc +++ b/includes/jplayer.admin.inc @@ -124,10 +124,13 @@ function jplayer_settings_form($form, &$form_state) { * Validation for jplayer_settings_form(). */ function jplayer_settings_form_validate($form, &$form_state) { - $form_state['values']['version'] = jplayer_get_version($form_state['values']['jplayer_directory']); - if ((int)$form_state['values']['version']['major'] != 2) { + $version = jplayer_get_version($form_state['values']['jplayer_directory']); + if (!is_array($version) || (int)$version['major'] != 2) { form_error($form['jplayer_directory'], t('Either the directory specified does not seem to contain the jPlayer library, or you are not using version 2 of jPlayer. Check to make sure that the jquery.player.min.js file is located within this directory.')); } + else { + $form_state['values']['version'] = $version; + } } /** @@ -135,4 +138,4 @@ function jplayer_settings_form_validate($form, &$form_state) { */ function jplayer_settings_form_submit($form, &$form_state) { drupal_set_message(t('The jPlayer library (version @version) successfully found in the %directory directory.', array('@version' => $form_state['values']['version']['version'], '%directory' => $form_state['values']['jplayer_directory']))); -} \ No newline at end of file +} -- 1.7.5.2