WordPress.org
Get WordPress

Plugin Directory

Changeset 2207984


Ignore:
Timestamp:
12/08/2019 08:53:17 AM (6 years ago)
Author:
playes
Message:

4.8.4

  • 修复图格模式会双重样式的问题
Location:
oss-upload/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • oss-upload/trunk/oss-upload.php

    r2207953 r2207984  
    22/*
    33 * Plugin Name: OSS Upload
    4  * Version: 4.8.3
     4 * Version: 4.8.4
    55 * Description: Upload with Aliyun OSS, with modified OSS Wrapper and fully native image edit function support.
    66 * Plugin URI: https://www.xiaomac.com/oss-upload.html
    … …  
    372372}
    373373
     374add_filter('wp_prepare_attachment_for_js', 'oss_upload_prepare_attachment');
     375function oss_upload_prepare_attachment($data){
     376    if(!ouops('oss_service',1)) return $data;
     377    $ouss = ouops('oss_style_separator') ? trim(ouops('oss_style_separator')) : '?x-oss-process=style/';
     378    foreach ($data['sizes'] as $k => $v){
     379        $data['sizes'][$k]['url'] = str_replace($ouss.$data['filename'], '', $data['sizes'][$k]['url']);
     380    }
     381    return $data;
     382}
     383
     384add_filter('wp_calculate_image_srcset', 'oss_upload_image_srcset', 9999, 5);
     385function oss_upload_image_srcset($sources, $size, $image_src, $meta, $id){//wp_get_attachment_image_srcset
     386    if(!ouops('oss') || empty($meta['sizes'])) return $sources;
     387    $upload = wp_get_upload_dir();
     388    if(parse_url(admin_url(), PHP_URL_SCHEME) == 'https'){
     389        $upload['default']['baseurl'] = set_url_scheme($upload['default']['baseurl'], 'https');
     390    }
     391    foreach ($sources as $k => $v){
     392        $url = str_replace($upload['default']['baseurl'], $upload['baseurl'], $sources[$k]['url']);
     393        $url = oss_upload_url_fixer($url);
     394        if(oss_upload_basename($meta['file']) == wp_basename($url)){//original
     395            if(ouops('oss_service',1) || ouops('oss_fullsize_style')){//style
     396                $ouss = ouops('oss_style_separator') ? trim(ouops('oss_style_separator')) : '?x-oss-process=style/';
     397                $full = ouops('oss_fullsize_style') ? trim(ouops('oss_fullsize_style')) : 'full';
     398                $url .= $ouss.$full;
     399            }
     400        }
     401        $sources[$k]['url'] = oss_upload_auto_webp($url);
     402    }
     403    return $sources;
     404}
     405
    374406add_filter('wp_get_attachment_url', 'oss_upload_attachment_url', 9999, 2);
    375407function oss_upload_attachment_url($url, $id){
    … …  
    401433    }
    402434    return $file;
    403 }
    404 
    405 add_filter('wp_calculate_image_srcset', 'oss_upload_image_srcset', 9999, 5);
    406 function oss_upload_image_srcset($sources, $size, $image_src, $meta, $id){//wp_get_attachment_image_srcset
    407     if(!ouops('oss') || empty($meta['sizes'])) return $sources;
    408     $upload = wp_get_upload_dir();
    409     if(parse_url(admin_url(), PHP_URL_SCHEME) == 'https'){
    410         $upload['default']['baseurl'] = set_url_scheme($upload['default']['baseurl'], 'https');
    411     }
    412     foreach ($sources as $k => $v){
    413         $url = str_replace($upload['default']['baseurl'], $upload['baseurl'], $sources[$k]['url']);
    414         $url = oss_upload_url_fixer($url);
    415         if(oss_upload_basename($meta['file']) == wp_basename($url)){//original
    416             if(ouops('oss_service',1) || ouops('oss_fullsize_style')){//style
    417                 $ouss = ouops('oss_style_separator') ? trim(ouops('oss_style_separator')) : '?x-oss-process=style/';
    418                 $full = ouops('oss_fullsize_style') ? trim(ouops('oss_fullsize_style')) : 'full';
    419                 $url .= $ouss.$full;
    420             }
    421         }
    422         $sources[$k]['url'] = oss_upload_auto_webp($url);
    423     }
    424     return $sources;
    425435}
    426436

  • oss-upload/trunk/readme.txt

    r2207948 r2207984  
    55Tags: aliyun, oss, upload, media, files, storage, cloud, 阿里云, 媒体库, 图片, 上传, 云存储
    66Tested up to: 5.3
    7 Stable tag: 4.8.3
     7Stable tag: 4.8.4
    88
    99== Description ==
    … …  
    4343== Changelog ==
    4444
     45= 4.8.4 =
     46* 修复图格模式会双重样式的问题
     47
    4548= 4.8.3 =
    4649* 修复远程上传和连接修正的逻辑
Note: See TracChangeset for help on using the changeset viewer.