فهرست منبع

Update ConfigCacheService, fail to fallback earlier

Daniel Supernault 3 سال پیش
والد
کامیت
488561c270
2فایلهای تغییر یافته به همراه7 افزوده شده و 0 حذف شده
  1. 4 0
      app/Jobs/ImageOptimizePipeline/ImageOptimize.php
  2. 3 0
      app/Services/ConfigCacheService.php

+ 4 - 0
app/Jobs/ImageOptimizePipeline/ImageOptimize.php

@@ -39,6 +39,10 @@ class ImageOptimize implements ShouldQueue
      */
      */
     public function handle()
     public function handle()
     {
     {
+    	if(config('pixelfed.optimize_image') == false) {
+    		return;
+    	}
+
         $media = $this->media;
         $media = $this->media;
         $path = storage_path('app/'.$media->media_path);
         $path = storage_path('app/'.$media->media_path);
         if (!is_file($path) || $media->skip_optimize) {
         if (!is_file($path) || $media->skip_optimize) {

+ 3 - 0
app/Services/ConfigCacheService.php

@@ -14,6 +14,9 @@ class ConfigCacheService
 	{
 	{
 		$cacheKey = self::CACHE_KEY . $key;
 		$cacheKey = self::CACHE_KEY . $key;
 		$ttl = now()->addHours(12);
 		$ttl = now()->addHours(12);
+		if(!config('instance.enable_cc')) {
+			return config($key);
+		}
 
 
 		return Cache::remember($cacheKey, $ttl, function() use($key) {
 		return Cache::remember($cacheKey, $ttl, function() use($key) {