WordPress.org

Plugin Directory


Ignore:
Timestamp:
05/16/11 22:57:14 (3 years ago)
Author:
mark8barnes
Message:

0.45.2 - Fixes bug when upgrading from very early versions of Sermon Browser.

Location:
sermon-browser/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • sermon-browser/trunk/sb-includes/admin.php

    r385190 r385616  
    314314            wp_die(__("You do not have the correct permissions to Uninstall SermonBrowser", $sermon_domain)); 
    315315    if (isset($_POST['uninstall'])) 
    316         require('uninstall.php'); 
     316        require(SB_INCLUDES_DIR.'/uninstall.php'); 
    317317?> 
    318318    <form method="post"> 
     
    362362    //Save templates or reset to default 
    363363    if (isset($_POST['save']) || isset($_POST['resetdefault'])) { 
    364         require('dictionary.php'); 
     364        require(SB_INCLUDES_DIR.'/dictionary.php'); 
    365365        $multi = $_POST['multi']; 
    366366        $single = $_POST['single']; 
    367367        $style = $_POST['style']; 
    368368        if(isset($_POST['resetdefault'])){ 
    369             require('sb-install.php'); 
     369            require(SB_INCLUDES_DIR.'/sb-install.php'); 
    370370            $multi = sb_default_multi_template(); 
    371371            $single = sb_default_single_template(); 
     
    14581458    $id3_tags = array(); 
    14591459    if (isset($_GET['getid3'])) { 
    1460         require_once('getid3/getid3.php'); 
     1460        require_once(SB_INCLUDES_DIR.'/getid3/getid3.php'); 
    14611461        $file_data = $wpdb->get_row("SELECT name, type FROM {$wpdb->prefix}sb_stuff WHERE id = ".$wpdb->escape($_GET['getid3'])); 
    14621462        if ($file_data !== NULL) { 
  • sermon-browser/trunk/sb-includes/frontend.php

    r384459 r385616  
    657657function sb_print_url($url) { 
    658658    global $sermon_domain; 
    659     require ('filetypes.php'); 
     659    require (SB_INCLUDES_DIR.'/filetypes.php'); 
    660660    $pathinfo = pathinfo($url); 
    661661    $ext = $pathinfo['extension']; 
  • sermon-browser/trunk/sb-includes/podcast.php

    r385190 r385616  
    2929            return $duration; 
    3030        else { 
    31             require_once('getid3/getid3.php'); 
     31            require_once(SB_INCLUDES_DIR.'/getid3/getid3.php'); 
    3232            $getID3 = new getID3; 
    3333            $MediaFileInfo = $getID3->analyze(SB_ABSPATH.sb_get_option('upload_dir').$media_name); 
     
    7171// Returns correct MIME type 
    7272function sb_mime_type($media_name) { 
    73     require ('filetypes.php'); 
     73    require (SB_INCLUDES_DIR.'/filetypes.php'); 
    7474    $extension = strtolower(substr($media_name, strrpos($media_name, '.') + 1)); 
    7575    if (array_key_exists ($extension, $filetypes)) 
  • sermon-browser/trunk/sb-includes/readme.txt

    r385320 r385616  
    55Requires at least: 2.6 
    66Tested up to: 3.1.2 
    7 Stable tag: 0.44.1 
     7Stable tag: trunk 
    88 
    99Upload sermons to your website, where they can be searched, listened to, and downloaded. Easy to use with comprehensive help and tutorials. 
     
    222222== Upgrade Notice == 
    223223 
     224= 0.45.2 = 
     225Fixes bug when upgrading from very early versions of Sermon Browser. 
     226 
    224227= 0.45.1 = 
    225228Fixes PHP4 incompatibility, and bug when attaching URLs. 
     
    239242== Changelog == 
    240243 
     244= 0.45.2 (15 May 2011) = 
     245* **Bug fix:** Fixes bug when upgrading from very early versions of Sermon Browser ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/fatal-error-call-to-undefined-function-sb_delete_unused_tags-in-homepages35d195956195htdocslivingword-netdwp-contentpluginssermon-browsersb-includesupgrade-plivingwor/)). 
     246 
    241247= 0.45.1 (15 May 2011) = 
    242248* **Bug fix:** Syntax errors on PHP4, and URLs not attaching correctly ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/upgrade-error-line-816/)). 
     249* See [changeset](http://plugins.trac.wordpress.org/changeset/385190/sermon-browser/trunk). 
    243250 
    244251= 0.45 (13 May 2011) = 
  • sermon-browser/trunk/sb-includes/sb-install.php

    r384459 r385616  
    33    global $wpdb; 
    44    $sermonUploadDir = sb_get_default('sermon_path'); 
    5     require ('dictionary.php'); 
     5    require (SB_INCLUDES_DIR.'/dictionary.php'); 
    66    if (!is_dir(SB_ABSPATH.$sermonUploadDir)) 
    77        sb_mkdir(SB_ABSPATH.$sermonUploadDir); 
  • sermon-browser/trunk/sb-includes/upgrade.php

    r384459 r385616  
    4141// Runs the version upgrade procedures (re-save templates, add options added since last db update) 
    4242function sb_version_upgrade ($old_version, $new_version) { 
    43     require_once('dictionary.php'); 
     43    require_once(SB_INCLUDES_DIR.'/dictionary.php'); 
    4444    $sbmf = sb_get_option('search_template'); 
    4545    if ($sbmf) 
     
    5555//Runs the database upgrade procedures (modifies database structure) 
    5656function sb_database_upgrade ($old_version) { 
    57     require_once('dictionary.php'); 
    58     require_once('admin.php'); 
     57    require_once(SB_INCLUDES_DIR.'/dictionary.php'); 
     58    require_once(SB_INCLUDES_DIR.'/admin.php'); 
    5959    global $wpdb; 
    6060    $sermonUploadDir = sb_get_default('sermon_path'); 
  • sermon-browser/trunk/sermon.php

    r385190 r385616  
    55Description: Upload sermons to your website, where they can be searched, listened to, and downloaded. Easy to use with comprehensive help and tutorials. 
    66Author: Mark Barnes 
    7 Version: 0.45.1 
     7Version: 0.45.2 
    88Author URI: http://www.4-14.org.uk/ 
    99 
     
    5454* @package common_functions 
    5555*/ 
    56 define('SB_CURRENT_VERSION', '0.45.1'); 
     56define('SB_CURRENT_VERSION', '0.45.2'); 
    5757define('SB_DATABASE_VERSION', '1.7'); 
     58sb_define_constants(); 
    5859add_action ('plugins_loaded', 'sb_hijack'); 
    5960add_action ('init', 'sb_sermon_init'); 
     
    6162 
    6263if (version_compare(PHP_VERSION, '5.0.0', '<')) 
    63     require('sb-includes/php4compat.php'); 
     64    require(SB_INCLUDES_DIR.'/php4compat.php'); 
    6465 
    6566/** 
     
    7273 
    7374    global $filetypes, $wpdb, $sermon_domain; 
    74     sb_define_constants(); 
    7575 
    7676    if (function_exists('wp_timezone_supported') && wp_timezone_supported()) 
     
    7878 
    7979    if (isset($_POST['sermon']) && $_POST['sermon'] == 1) 
    80         require('sb-includes/ajax.php'); 
     80        require(SB_INCLUDES_DIR.'/ajax.php'); 
    8181    if (stripos($_SERVER['REQUEST_URI'], 'sb-style.css') !== FALSE || isset($_GET['sb-style'])) 
    82         require('sb-includes/style.php'); 
     82        require(SB_INCLUDES_DIR.'/style.php'); 
    8383 
    8484    //Forces sermon download of local file 
     
    196196    //Display the podcast if that's what's requested 
    197197    if (isset($_GET['podcast'])) 
    198         require('sb-includes/podcast.php'); 
     198        require(SB_INCLUDES_DIR.'/podcast.php'); 
    199199 
    200200    // Register custom CSS and javascript files 
     
    232232            $db_version = sb_get_option('db_version'); 
    233233        if ($db_version && $db_version != SB_DATABASE_VERSION) { 
    234             require_once ('sb-includes/upgrade.php'); 
     234            require_once (SB_INCLUDES_DIR.'/upgrade.php'); 
    235235            sb_database_upgrade ($db_version); 
    236236        } elseif (!$db_version) { 
    237             require ('sb-includes/sb-install.php'); 
     237            require (SB_INCLUDES_DIR.'/sb-install.php'); 
    238238            sb_install(); 
    239239        } 
    240240        $sb_version = sb_get_option('code_version'); 
    241241        if ($sb_version != SB_CURRENT_VERSION) { 
    242             require_once ('sb-includes/upgrade.php'); 
     242            require_once (SB_INCLUDES_DIR.'/upgrade.php'); 
    243243            sb_version_upgrade ($sb_version, SB_CURRENT_VERSION); 
    244244        } 
     
    250250    // Check to see what functions are required, and only load what is needed 
    251251    if (stripos($_SERVER['REQUEST_URI'], '/wp-admin/') === FALSE) { 
    252         require ('sb-includes/frontend.php'); 
     252        require (SB_INCLUDES_DIR.'/frontend.php'); 
    253253        add_action('wp_head', 'sb_add_headers', 0); 
    254254        add_action('wp_head', 'wp_print_styles', 9); 
     
    258258            add_action ('wp_footer', 'sb_footer_stats'); 
    259259    } else { 
    260         require ('sb-includes/admin.php'); 
     260        require (SB_INCLUDES_DIR.'/admin.php'); 
    261261        add_action ('admin_menu', 'sb_add_pages'); 
    262262        add_action ('rightnow_end', 'sb_rightnow'); 
     
    571571*/ 
    572572function sb_widget_sermon_wrapper ($args, $widget_args = 1) { 
    573     require_once ('sb-includes/frontend.php'); 
     573    require_once (SB_INCLUDES_DIR.'/frontend.php'); 
    574574    sb_widget_sermon($args, $widget_args); 
    575575} 
     
    582582*/ 
    583583function sb_widget_tag_cloud_wrapper ($args) { 
    584     require_once ('sb-includes/frontend.php'); 
     584    require_once (SB_INCLUDES_DIR.'/frontend.php'); 
    585585    sb_widget_tag_cloud ($args); 
    586586} 
     
    593593*/ 
    594594function sb_widget_popular_wrapper ($args) { 
    595     require_once ('sb-includes/frontend.php'); 
     595    require_once (SB_INCLUDES_DIR.'/frontend.php'); 
    596596    sb_widget_popular ($args); 
    597597} 
     
    695695    define ('SB_PLUGIN_DIR', sb_sanitise_path(defined('WP_CONTENT_DIR') ? WP_CONTENT_DIR : ABSPATH.'wp-content').'/plugins'); 
    696696    define ('SB_WP_CONTENT_DIR', sb_sanitise_path(WP_CONTENT_DIR)); 
     697    define ('SB_INCLUDES_DIR', SB_PLUGIN_DIR.'/sermon-browser/sb-includes'); 
    697698    define ('SB_ABSPATH', sb_sanitise_path(ABSPATH)); 
    698699    define ('GETID3_INCLUDEPATH', SB_PLUGIN_DIR.'/'.plugin_basename(dirname(__FILE__)).'/sb-includes/getid3/'); 
Note: See TracChangeset for help on using the changeset viewer.