Changeset 859562
- Timestamp:
- 02/17/2014 05:54:03 PM (12 years ago)
- Location:
- buddypress-media/trunk
- Files:
-
- 9 edited
-
app/admin/RTMediaAdmin.php (modified) (1 diff)
-
app/assets/js/admin.js (modified) (1 diff)
-
app/assets/js/rtMedia.backbone.js (modified) (2 diffs)
-
app/main/controllers/api/RTMediaJsonApi.php (modified) (3 diffs)
-
app/main/controllers/template/RTMediaNav.php (modified) (1 diff)
-
app/main/controllers/template/rt-template-functions.php (modified) (1 diff)
-
app/main/routers/query/RTMediaQuery.php (modified) (1 diff)
-
index.php (modified) (1 diff)
-
readme.txt (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
buddypress-media/trunk/app/admin/RTMediaAdmin.php
r847489 r859562 454 454 */ 455 455 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" ); 457 457 add_submenu_page ( 'rtmedia-settings', __( 'Settings', 'rtmedia' ), __( 'Settings', 'rtmedia' ), 'manage_options', 'rtmedia-settings', array( $this, 'settings_page' ) ); 458 458 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 70 70 71 71 }); 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 } 72 80 if (!return_code) { 73 81 e.preventDefault(); -
buddypress-media/trunk/app/assets/js/rtMedia.backbone.js
r854592 r859562 281 281 uploaderObj.uploader.bind('UploadComplete', function(up, files) { 282 282 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) 284 284 galleryObj.reloadView(); 285 285 } … … 594 594 if(tmp_array.length > 1){ 595 595 var ext= tmp_array[tmp_array.length - 1]; 596 ext = ext.toLowerCase(); 596 597 if( jQuery.inArray( ext ,ext_array) === -1){ 597 598 return true; -
buddypress-media/trunk/app/main/controllers/api/RTMediaJsonApi.php
r855726 r859562 961 961 $file = $tmp_name . '.'.$image_type; 962 962 $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')); 964 964 // echo $file; 965 965 $new_look = wp_upload_bits($title.'.'.$image_type, '', $rtmedia_file); 966 966 $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')); 968 968 foreach ( $new_look as $key => $value ){ 969 969 $new_look[0][$key] = $value; … … 989 989 $rtupload = $rtmedia->add( $uploaded, $new_look ); 990 990 $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 } 992 994 $media = $rtmedia->model->get ( array( 'id' => $rtupload[ 0 ] ) ); 993 995 $rtMediaNav = new RTMediaNav(); … … 1174 1176 1175 1177 } 1176 function api_new_ look_upload_dir($args){1178 function api_new_media_upload_dir($args){ 1177 1179 if( !empty($args) || !is_array($args) || empty($_POST['token']) ){ 1178 1180 foreach( $args as $key => $arg ){ -
buddypress-media/trunk/app/main/controllers/template/RTMediaNav.php
r854592 r859562 69 69 function admin_nav () { 70 70 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 } 72 75 if ( function_exists ( "bp_use_wp_admin_bar" ) && ! bp_use_wp_admin_bar () ) 73 76 return; -
buddypress-media/trunk/app/main/controllers/template/rt-template-functions.php
r854592 r859562 379 379 $media = $model->get_media ( array( 'album_id' => $id, 'media_type' => 'photo', 'media_author' => $rtmedia_query->query['context_id'] ), 0, 1 ); 380 380 } 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 } 383 387 384 388 if ( $media ) { -
buddypress-media/trunk/app/main/routers/query/RTMediaQuery.php
r854592 r859562 552 552 } 553 553 554 $this->media_query = apply_filters( 'rtmedia_media_query', $this->media_query ); 555 554 556 if ( $this->is_album_gallery () ) { 555 557 -
buddypress-media/trunk/index.php
r856201 r859562 5 5 Plugin URI: http://rtcamp.com/buddypress-media/?utm_source=dashboard&utm_medium=plugin&utm_campaign=buddypress-media 6 6 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.17 Version: 3.6.2 8 8 Author: rtCamp 9 9 Text Domain: rtmedia -
buddypress-media/trunk/readme.txt
r856201 r859562 7 7 Requires at least: WordPress 3.6 8 8 Tested up to: WordPress 3.7 + BuddyPress 1.8.1 9 Stable tag: 3.6. 1.19 Stable tag: 3.6.2 10 10 11 11 Add albums, photo, audio/video encoding, privacy, sharing, front-end uploads & more. All this works mobile/tablets devices. … … 133 133 134 134 Please 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 135 138 = 3.6.1.1 = 136 139 * Bug fixes … … 698 701 == Upgrade Notice == 699 702 700 = 3.6. 1.1=703 = 3.6.2 = 701 704 Requires BuddyPress 1.7 or higher, if using BuddyPress. Bug fixes. 702 705
Note: See TracChangeset
for help on using the changeset viewer.