Imagick: close session to avoid blocking request when generating preview. Fix resize when loading page.

cdujeu · cdujeu · commit 09abbd931d06 · 2016-07-05T11:45:07.000+02:00
diff --git a/core/src/plugins/editor.imagick/class.IMagickPreviewer.js b/core/src/plugins/editor.imagick/class.IMagickPreviewer.js
@@ -37,7 +37,7 @@ Class.create("IMagickPreviewer", Diaporama, {
 			this.jsImageLoading = false;
 			this.imgTag.src = this.jsImage.src;
             this.imgTag.setStyle({opacity:1});
-			this.resizeImage(true);
+			this.resizeImage();
 			var i;
 			for(i=0;i<this.items.length;i++){
 				if(this.items[i] == this.currentFile){
diff --git a/core/src/plugins/editor.imagick/class.IMagickPreviewer.php b/core/src/plugins/editor.imagick/class.IMagickPreviewer.php
@@ -84,6 +84,7 @@ public function switchAction($action, $httpVars, $filesVars)
             }
 
             $cache = AJXP_Cache::getItem("imagick_".($this->extractAll?"full":"thumb"), $file, array($this, "generateJpegsCallback"));
+            session_write_close();
             $cacheData = $cache->getData();
 
             if (!$this->useOnTheFly && $this->extractAll) { // extract all on first view

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public function switchAction($action, $httpVars, $filesVars)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`$cache = AJXP_Cache::getItem("imagick_".($this->extractAll?"full":"thumb"), $file, array($this, "generateJpegsCallback"));`
	`87`	`+ session_write_close();`
`87`	`88`	`$cacheData = $cache->getData();`
`88`	`89`
`89`	`90`	`if (!$this->useOnTheFly && $this->extractAll) { // extract all on first view`