Plugin Directory

Changeset 859562


Ignore:
Timestamp:
02/17/2014 05:54:03 PM (12 years ago)
Author:
faishal
Message:

Version 3.6.2 released

Location:
buddypress-media/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • buddypress-media/trunk/app/admin/RTMediaAdmin.php

    r847489 r859562  
    454454         */
    455455        public function menu () {
    456             add_menu_page ( 'rtMedia', 'rtMedia', 'manage_options', 'rtmedia-settings', array( $this, 'settings_page' ),RTMEDIA_URL."app/assets/img/rtmedia-logo.png" );
     456            add_menu_page ( 'rtMedia', 'rtMedia', 'manage_options', 'rtmedia-settings', array( $this, 'settings_page' ),RTMEDIA_URL."app/assets/img/rtmedia-logo.png", "90.1" );
    457457            add_submenu_page ( 'rtmedia-settings', __( 'Settings', 'rtmedia' ), __( 'Settings', 'rtmedia' ), 'manage_options', 'rtmedia-settings', array( $this, 'settings_page' ) );
    458458            add_submenu_page ( 'rtmedia-settings', __( 'Addons', 'rtmedia' ), __( 'Addons', 'rtmedia' ), 'manage_options', 'rtmedia-addons', array( $this, 'addons_page' ) );
  • buddypress-media/trunk/app/assets/js/admin.js

    r847489 r859562  
    7070
    7171        });
     72    var general_videothumb = jQuery('input[name^="rtmedia-options[general_videothumbs]"]');
     73    if( return_code && typeof general_videothumb != "undefined" ) {
     74        if( general_videothumb.val() <= 0 ) {
     75        alert("Number of video thumbnails to be generated should be greater than 0 in image sizes settings. ");
     76        return_code = false;
     77                return false;
     78        }
     79    }
    7280        if (!return_code) {
    7381            e.preventDefault();
  • buddypress-media/trunk/app/assets/js/rtMedia.backbone.js

    r854592 r859562  
    281281        uploaderObj.uploader.bind('UploadComplete', function(up, files) {
    282282        activity_id = -1;
    283             if( rtmedia_gallery_reload_on_upload =='1'){ //reload gallery view when upload completes if enabled( by default enabled)
     283            if( typeof rtmedia_gallery_reload_on_upload != "undefined" && rtmedia_gallery_reload_on_upload =='1'){ //reload gallery view when upload completes if enabled( by default enabled)
    284284                galleryObj.reloadView();
    285285            }
     
    594594            if(tmp_array.length > 1){
    595595                var ext= tmp_array[tmp_array.length - 1];
     596        ext = ext.toLowerCase();
    596597                if( jQuery.inArray( ext ,ext_array) === -1){
    597598                    return true;
  • buddypress-media/trunk/app/main/controllers/api/RTMediaJsonApi.php

    r855726 r859562  
    961961            $file = $tmp_name . '.'.$image_type;
    962962            $success = file_put_contents($file, $rtmedia_file);
    963             add_filter('upload_dir', 'api_new_look_upload_dir');
     963            add_filter('upload_dir', array($this, 'api_new_media_upload_dir'));
    964964        //    echo $file;
    965965            $new_look = wp_upload_bits($title.'.'.$image_type, '', $rtmedia_file);
    966966            $new_look['type'] = 'image/'.$image_type;
    967             remove_filter('upload_dir', 'api_new_look_upload_dir');
     967            remove_filter('upload_dir', array($this, 'api_new_media_upload_dir'));
    968968            foreach ( $new_look as $key => $value ){
    969969                $new_look[0][$key] = $value;
     
    989989            $rtupload = $rtmedia->add( $uploaded, $new_look );
    990990            $id = rtmedia_media_id($rtupload[0]);
    991             wp_set_post_terms( $id , $_POST["tags"] , 'media-category',true);
     991            if(!empty($_POST['tags'])){
     992                wp_set_post_terms( $id , $_POST["tags"] , 'media-category',true);
     993            }
    992994            $media = $rtmedia->model->get ( array( 'id' => $rtupload[ 0 ] ) );
    993995            $rtMediaNav = new RTMediaNav();
     
    11741176
    11751177    }
    1176     function api_new_look_upload_dir($args){
     1178    function api_new_media_upload_dir($args){
    11771179       if( !empty($args) || !is_array($args) || empty($_POST['token']) ){
    11781180           foreach( $args as $key => $arg ){
  • buddypress-media/trunk/app/main/controllers/template/RTMediaNav.php

    r854592 r859562  
    6969    function admin_nav () {
    7070        global $wp_admin_bar;
    71 
     71    global $rtmedia;
     72    if( ( ! isset( $rtmedia->options['buddypress_enableOnProfile'] ) ) || ( isset( $rtmedia->options['buddypress_enableOnProfile'] ) && $rtmedia->options['buddypress_enableOnProfile'] == '0' ) ) {
     73        return;
     74    }
    7275        if ( function_exists ( "bp_use_wp_admin_bar" ) && ! bp_use_wp_admin_bar () )
    7376            return;
  • buddypress-media/trunk/app/main/controllers/template/rt-template-functions.php

    r854592 r859562  
    379379        $media = $model->get_media ( array( 'album_id' => $id, 'media_type' => 'photo', 'media_author' => $rtmedia_query->query['context_id'] ), 0, 1 );
    380380    } else {
    381         $media = $model->get_media ( array( 'album_id' => $id, 'media_type' => 'photo'), 0, 1 );
    382         }
     381    if( isset( $rtmedia_query->query['context_id'] ) && isset( $rtmedia_query->query['context'] ) && $rtmedia_query->query['context'] == "group" ) {
     382        $media = $model->get_media ( array( 'album_id' => $id, 'media_type' => 'photo', 'context_id' => $rtmedia_query->query['context_id'] ), 0, 1 );
     383    } else {
     384        $media = $model->get_media ( array( 'album_id' => $id, 'media_type' => 'photo'), 0, 1 );
     385    }
     386    }
    383387
    384388    if ( $media ) {
  • buddypress-media/trunk/app/main/routers/query/RTMediaQuery.php

    r854592 r859562  
    552552        }
    553553
     554    $this->media_query = apply_filters( 'rtmedia_media_query', $this->media_query );
     555
    554556        if ( $this->is_album_gallery () ) {
    555557
  • buddypress-media/trunk/index.php

    r856201 r859562  
    55  Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media
    66  Description: This plugin adds missing media rich features like photos, videos and audio uploading to BuddyPress which are essential if you are building social network, seriously!
    7   Version: 3.6.1.1
     7  Version: 3.6.2
    88  Author: rtCamp
    99  Text Domain: rtmedia
  • buddypress-media/trunk/readme.txt

    r856201 r859562  
    77Requires at least: WordPress 3.6
    88Tested up to: WordPress 3.7 + BuddyPress 1.8.1
    9 Stable tag: 3.6.1.1
     9Stable tag: 3.6.2
    1010
    1111Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices.
     
    133133
    134134Please visit [rtMedia's Roadmap page](http://rtcamp.com/rtmedia/roadmap/?utm_source=readme&utm_medium=plugin&utm_campaign=buddypress-media "Visit rtMedia's Features page") to get some details about future releases.
     135= 3.6.2 =
     136* Bug fixes
     137
    135138= 3.6.1.1 =
    136139* Bug fixes
     
    698701== Upgrade Notice ==
    699702
    700 = 3.6.1.1 =
     703= 3.6.2 =
    701704Requires BuddyPress 1.7 or higher, if using BuddyPress. Bug fixes.
    702705
Note: See TracChangeset for help on using the changeset viewer.