Merge pull request #25 from ZNick1982/fix_fine_tuning

Fixed missed fine tuning
uploadcare · Feb 12, 2018 · d40e8a7 · d40e8a7
2 parents 101fb54 + 6b1c3da
commit d40e8a7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 2.5.2 ([Download](http://downloads.wordpress.org/plugin/uploadcare.2.5.2.zip))
+- Fixed missed "Fine tuning" setup for widget
+- Test up to Wordpress 4.9.4
+
 ### 2.5.1 ([Download](http://downloads.wordpress.org/plugin/uploadcare.2.5.1.zip))
 - Fixed initialization warnings in utils.php module
 

diff --git a/inc/actions.php b/inc/actions.php
@@ -244,9 +244,9 @@ function uploadcare_media_files_menu_handle() {
 
 add_action('post-upload-ui', 'uploadcare_media_upload');
 function uploadcare_media_upload() {
+    $finetuning = stripcslashes(get_option('uploadcare_finetuning', ''));
     $img = plugins_url('media/logo.png', dirname(__FILE__));
     ?>
-
     <p class="uploadcare-picker">
       <a  id="uploadcare-post-upload-ui-btn"
           class="button button-hero"
@@ -256,6 +256,7 @@ class="button button-hero"
       </a>
     </p>
     <p class="max-upload-size">Maximum upload file size: 100MB (or more).</p>
+    <script type="text/javascript"><?php  echo $finetuning ?></script>
     <?php
 }
 

diff --git a/inc/shortcodes.php b/inc/shortcodes.php
@@ -3,9 +3,11 @@
 add_shortcode('uploadcare', 'uploadcare_uploadcare_shortcode');
 function uploadcare_uploadcare_shortcode() {
     wp_enqueue_script('uploadcare-shortcodes');
-
+    $finetuning = stripcslashes(get_option('uploadcare_finetuning', ''));
     $id = get_the_ID();
+
     $html = <<<HTML
+<script type="text/javascript">{$finetuning}</script>
 Upload files:
 <input class="uploadcare-uploader"
        data-multiple="true"

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@
 Contributors: grayhound1, dmitry-mukhin
 Tags: media upload, file handling, cdn, storage, facebook, dropbox, instagram, google drive, vk, evernote, box, images, flickr
 Requires at least: 3.5+
-Tested up to: 4.9.1
-Stable tag: 2.5.1
+Tested up to: 4.9.4
+Stable tag: 2.5.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Donate link: https://uploadcare.com/pricing/
@@ -115,6 +115,10 @@ Access all files in your Uploadcare account via Media Library.
 
 == Changelog ==
 
+= 2.5.2 =
+* Fixed missed "Fine tuning" setup for widget
+* Test up to Wordpress 4.9.4
+
 = 2.5.1 =
 * Fixed initialization warnings in utils.php module
 

diff --git a/uploadcare.php b/uploadcare.php
@@ -3,7 +3,7 @@
 Plugin Name: Uploadcare
 Plugin URI: http://github.com/uploadcare/uploadcare-wordpress
 Description: Uploadcare let's you upload anything from anywhere (Instagram, Facebook, Dropbox, etc.)
-Version: 2.5.1
+Version: 2.5.2
 Author: Uploadcare
 Author URI: https://uploadcare.com/
 License: GPL2
@@ -14,7 +14,7 @@
     exit("Uploadcare plugin requires PHP version <b>5.3+</b>, you've got <b>" . PHP_VERSION . "</b>");
 }
 
-define('UPLOADCARE_PLUGIN_VERSION', '2.5.1');
+define('UPLOADCARE_PLUGIN_VERSION', '2.5.2');
 define('UPLOADCARE_WIDGET_VERSION', '3.x');
 define('UPLOADCARE_TAB_EFFECTS_VERSION', '1.x');