Merge commit 'upstream/master'

Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php

2 files changed, 9 insertions, 1 deletions

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index a212ef85..40830bc0 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -223,6 +223,7 @@ class gallery_installer {
     module::set_var("gallery", "resize_size", 640);
     module::set_var("gallery", "default_locale", "en_US");
     module::set_var("gallery", "image_quality", 75);
+    module::set_var("gallery", "image_sharpen", 15);
 
     // Add rules for generating our thumbnails and resizes
     graphics::add_rule(
@@ -259,7 +260,7 @@ class gallery_installer {
     module::set_var("gallery", "show_credits", 1);
     // @todo this string needs to be picked up by l10n_scanner
     module::set_var("gallery", "credits", "Powered by <a href=\"%url\">Gallery %version</a>");
-    module::set_version("gallery", 10);
+    module::set_version("gallery", 11);
   }
 
   static function upgrade($version) {
@@ -336,6 +337,12 @@ class gallery_installer {
 
       module::set_version("gallery", $version = 10);
     }
+
+    if ($version == 10) {
+      module::set_var("gallery", "image_sharpen", 15);
+
+      module::set_version("gallery", $version = 11);
+    }
 }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index cc37a193..787f8dc3 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -209,6 +209,7 @@ class graphics_Core {
       Image::factory($input_file)
         ->resize($options["width"], $options["height"], $options["master"])
         ->quality(module::get_var("gallery", "image_quality"))
+        ->sharpen(module::get_var("gallery", "image_sharpen"))
         ->save($output_file);
     }