Changeset 753109

Timestamp:

08/07/2013 05:34:50 PM (13 years ago)

Author:

bhengh

Message:

Updating to 0.45.11 (WordPress 3.6 compatibility fix related to getid3 lib)

Location:

sermon-browser/trunk

Files:

• sb-includes/admin.php (modified) (2 diffs)
• sb-includes/podcast.php (modified) (1 diff)
• sermon.php (modified) (3 diffs)

sermon-browser/trunk/sb-includes/admin.php

@@ -1464 +1464 @@
     $id3_tags = array();
     if (isset($_GET['getid3'])) {
-        require_once(SB_INCLUDES_DIR.'/getid3/getid3.php');
         $file_data = $wpdb->get_row("SELECT name, type FROM {$wpdb->prefix}sb_stuff WHERE id = ".$wpdb->escape($_GET['getid3']));
         if ($file_data !== NULL) {
+            if ( ! class_exists( 'getID3' ) ) {
+                if ( version_compare(get_bloginfo('version'), '3.6', '<') )
+                    require(SB_INCLUDES_DIR.'/getid3/getid3.php');              
+                else
+                    require( ABSPATH . WPINC . '/ID3/getid3.php' );
+            }
             $getID3 = new getID3;
             if ($file_data->type == 'url') {
@@ -2139 +2144 @@
     if (stripos(sb_get_option('mp3_shortcode'), '%SERMONURL%') === FALSE) {
         echo '<div id="message" class="updated fade"><p><b>';
-        _e('Error:</b> The MP3 shortcode must link to individual sermon files. You do this by including <span style="color:red">%SERMONURL%</span> in your shortcode (e.g. [audio:%SERMONURL%]). SermonBrowser will then replace %SERMONURL% with a link to each sermon.', $sermon_domain);
+        _e('Error:</b> The MP3 shortcode must link to individual sermon files. You do this by including <span style="color:red">%SERMONURL%</span> in your shortcode (e.g. [audio mp3="%SERMONURL%"]). SermonBrowser will then replace %SERMONURL% with a link to each sermon.', $sermon_domain);
         echo '</div>';
     } elseif (do_shortcode(sb_get_option('mp3_shortcode')) == sb_get_option('mp3_shortcode')) {
-        if ((substr(sb_get_option('mp3_shortcode'), 0, 18) == '[audio:%SERMONURL%') && !function_exists('ap_insert_player_widgets')) {
-            if ($wpdb->get_var("SELECT COUNT(id) FROM {$wpdb->prefix}sb_stuff WHERE name LIKE '%.mp3'")>0)
-                echo '<div id="message" class="updated"><p><b>'.sprintf(__('Tip: Installing the %1$sWordpress Audio Player%2$s, or another Wordpress MP3 player plugin will allow users to listen to your sermons more easily.', $sermon_domain), '<a href="'.site_url().'/wp-admin/plugin-install.php?tab=search&s=audio%20player&type=term&search=Search">', '</a>').'</b></div>';
-        } elseif (substr(sb_get_option('mp3_shortcode'), 0, 18) != '[audio:%SERMONURL%') {
-            echo '<div id="message" class="updated fade"><p><b>';
-            _e('Error:</b> You have specified a custom MP3 shortcode, but Wordpress doesn&#146;t know how to interpret it. Make sure the shortcode is correct, and that the appropriate plugin is activated.', $sermon_domain);
-            echo '</div>';
-        }
+        echo '<div id="message" class="updated fade"><p><b>';
+        _e('Error:</b> You have specified a custom MP3 shortcode, but Wordpress doesn&#146;t know how to interpret it. Make sure the shortcode is correct, and that the appropriate plugin is activated.', $sermon_domain);
+        echo '</div>';
     }
     if (sb_display_url() == "") {

sermon-browser/trunk/sb-includes/podcast.php

@@ -29 +29 @@
             return $duration;
         else {
-            require_once(SB_INCLUDES_DIR.'/getid3/getid3.php');
+            if ( ! class_exists( 'getID3' ) ) {
+                if ( version_compare(get_bloginfo('version'), '3.6', '<') )
+                    require(SB_INCLUDES_DIR.'/getid3/getid3.php');              
+                else
+                    require( ABSPATH . WPINC . '/ID3/getid3.php' );
+            }
             $getID3 = new getID3;
             $MediaFileInfo = $getID3->analyze(SB_ABSPATH.sb_get_option('upload_dir').$media_name);

sermon-browser/trunk/sermon.php

@@ -5 +5 @@
 Description: Upload sermons to your website, where they can be searched, listened to, and downloaded. Easy to use with comprehensive help and tutorials.
 Author: Mark Barnes
-Version: 0.45.10
+Version: 0.45.11
 Author URI: http://www.4-14.org.uk/
 
@@ -54 +54 @@
 * @package common_functions
 */
-define('SB_CURRENT_VERSION', '0.45.10');
+define('SB_CURRENT_VERSION', '0.45.11');
 define('SB_DATABASE_VERSION', '1.7');
 sb_define_constants();
@@ -709 +709 @@
     define ('SB_INCLUDES_DIR', SB_PLUGIN_DIR.'/sermon-browser/sb-includes');
     define ('SB_ABSPATH', sb_sanitise_path(ABSPATH));
-    define ('GETID3_INCLUDEPATH', SB_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/sb-includes/getid3/');
-    define ('GETID3_HELPERAPPSDIR', GETID3_INCLUDEPATH);
+    if ( version_compare(get_bloginfo('version'), '3.6', '<') ) {
+        define ('GETID3_INCLUDEPATH', SB_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/sb-includes/getid3/');
+        define ('GETID3_HELPERAPPSDIR', GETID3_INCLUDEPATH);
+    }
 }