From a1c57325c994798e72d4e29d7d4cb03a829ee1c5 Mon Sep 17 00:00:00 2001
From: Alberto <trippo@hotmail.it>
Date: Tue, 28 Jul 2015 08:21:14 +0200
Subject: [PATCH] Version 9.9.5

- fixed a Adobe Creative SDK issue
- fixed a problem when you edit multiple image in the same session
- fixed a problem with security issue in some server configurations
- added maxSize to Adobe Creative SDK export image (default now is 1400)
---
 filemanager/config/config.php    | 4 +++-
 filemanager/dialog.php           | 6 +++---
 resources/assets/js/include.js   | 3 +--
 resources/assets/less/style.less | 5 ++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/filemanager/config/config.php b/filemanager/config/config.php
index 2b0d646e..1e8638cd 100755
--- a/filemanager/config/config.php
+++ b/filemanager/config/config.php
@@ -262,6 +262,7 @@
 	'aviary_language'                         => "en",
 	'aviary_theme'                            => "light",
 	'aviary_tools'                            => "all",
+	'aviary_maxSize'                          => "1400",
 	// Add or modify the Aviary options below as needed - they will be json encoded when added to the configuration so arrays can be utilized as needed
 
 	//The filter and sorter are managed through both javascript and php scripts because if you have a lot of
@@ -355,7 +356,8 @@
 			'apiKey'     => $config['aviary_apiKey'],
 			'language'   => $config['aviary_language'],
 			'theme'      => $config['aviary_theme'],
-			'tools'      => $config['aviary_tools']
+			'tools'      => $config['aviary_tools'],
+			'maxSize'    => $config['aviary_maxSize']
 		),
 	)
 );
diff --git a/filemanager/dialog.php b/filemanager/dialog.php
index dade7da4..f1a554ab 100755
--- a/filemanager/dialog.php
+++ b/filemanager/dialog.php
@@ -322,14 +322,14 @@
 				$.ajax({
 					type: "POST",
 					url: "ajax_calls.php?action=save_img",
-					data: { url: newURL, path:$('#sub_folder').val()+$('#fldr_value').val(), name:$('#aviary_img').data('name') }
+					data: { url: newURL, path:$('#sub_folder').val()+$('#fldr_value').val(), name:$('#aviary_img').attr('data-name') }
 				}).done(function( msg ) {
 					featherEditor.close();
 					d = new Date();
-					$("figure[data-name='"+$('#aviary_img').data('name')+"']").find('img').each(function(){
+					$("figure[data-name='"+$('#aviary_img').attr('data-name')+"']").find('img').each(function(){
 					  $(this).attr('src',$(this).attr('src')+"?"+d.getTime());
 					});
-					$("figure[data-name='"+$('#aviary_img').data('name')+"']").find('figcaption a.preview').each(function(){
+					$("figure[data-name='"+$('#aviary_img').attr('data-name')+"']").find('figcaption a.preview').each(function(){
 					  $(this).attr('data-url',$(this).data('url')+"?"+d.getTime());
 				    });
 					hide_animation();
diff --git a/resources/assets/js/include.js b/resources/assets/js/include.js
index 7b64df98..fab35961 100755
--- a/resources/assets/js/include.js
+++ b/resources/assets/js/include.js
@@ -3,7 +3,7 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
 {
   "use strict";
 
-  var version = "9.9.4";
+  var version = "9.9.5";
   var active_contextmenu = true;
   var copy_count = 0;
 
@@ -105,7 +105,6 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
         var full_path = $('#base_url_true').val() + $('#cur_dir').val() + filename;
 
         var aviaryElement = $('#aviary_img');
-
         aviaryElement.attr('data-name', filename);
         show_animation();
         aviaryElement.attr('src', full_path).load(launchEditor(aviaryElement.attr('id'), full_path));
diff --git a/resources/assets/less/style.less b/resources/assets/less/style.less
index 99674863..aed25121 100755
--- a/resources/assets/less/style.less
+++ b/resources/assets/less/style.less
@@ -183,15 +183,14 @@ body .avpw .avpw_primary_button,
 body .avpw .avpw_primary_button:link,
 body .avpw .avpw_primary_button:visited,
 body .avpw .avpw_primary_button:active {
-  background-color: #999999;
   color: #ffffff;
-  background:none;
+  background:#999999;
   border:none;
 }
 
 body .avpw .avpw_primary_button:hover{
     border:none;
-    background-color: #666666;
+    background: #666666;
 }
 
 .uploader{