Fixes for r77451 per CR: add UploadStashZeroLengthFileException to AutoLoader and...

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index bcaa038..5661375 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -688,6 +688,7 @@ $wgAutoloadLocalClasses = array(
        'UploadStashBadPathException' => 'includes/upload/UploadStash.php',
        'UploadStashBadVersionException' => 'includes/upload/UploadStash.php',
        'UploadStashFileException' => 'includes/upload/UploadStash.php',
+       'UploadStashZeroLengthFileException' => 'includes/upload/UploadStash.php',
 
        # languages
        'Language' => 'languages/Language.php',

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 0078e5b..c69992f 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -258,6 +258,14 @@ $wgTmpDirectory     = false;
  */
 $wgUploadBaseUrl    = "";
 
+/**
+ * To enable remote on-demand scaling, set this to the thumbnail base URL.
+ * Full thumbnail URL will be like $wgUploadStashScalerBaseUrl/e/e6/Foo.jpg/123px-Foo.jpg
+ * where 'e6' are the first two characters of the MD5 hash of the file name.
+ * If $wgUploadStashScalerBaseUrl is set to false, thumbs are rendered locally as needed.
+ */
+$wgUploadStashScalerBaseUrl = false;
+
 /**
  * To set 'pretty' URL paths for actions other than
  * plain page views, add to this array. For instance: