Changeset 1456634

Timestamp:

07/18/2016 10:02:23 PM (10 years ago)

Author:

kosinix

Message:

To trunk version 2.12.3

Location:

cyclone-slider-2/trunk

Files:

• README.txt (modified) (1 diff)
• cyclone-slider.php (modified) (2 diffs)
• src/CycloneSlider/ImageResizer.php (modified) (3 diffs)
• src/code-5.3.php (modified) (1 diff)

cyclone-slider-2/trunk/README.txt

@@ -118 +118 @@
 
 == Changelog ==
+
+= 2.12.3 - 2016-07-19 =
+* Fix for require_once not finding relative paths and fatal error when saving non image slides.
 
 = 2.12.2 - 2016-07-18 =

cyclone-slider-2/trunk/cyclone-slider.php

@@ -4 +4 @@
 Plugin URI: http://www.codefleet.net/cyclone-slider-2/
 Description: Create and manage sliders with ease. Built for both casual users and developers.
-Version: 2.12.2
+Version: 2.12.3
 Author: Nico Amarilla
 Author URI: http://www.codefleet.net/
@@ -255 +255 @@
     }
 
-    $object = new CycloneSlider_ImageResizer( $plugin['image_sizes'], $plugin['image_editor'] );
+    $object = new CycloneSlider_ImageResizer( $plugin['image_sizes'], $plugin['image_editor'], $plugin['path'] );
     return $object;
 }

cyclone-slider-2/trunk/src/CycloneSlider/ImageResizer.php

@@ -4 +4 @@
 */
 class CycloneSlider_ImageResizer {
-    
+
     protected $image_sizes;
     protected $image_editor;
-    
-    public function __construct( $image_sizes, $image_editor ){
-        $this->image_sizes = $image_sizes;
+    protected $path;
+
+    public function __construct( $image_sizes, $image_editor, $path ){
+        $this->image_sizes = $image_sizes;
         $this->image_editor = $image_editor;
-    }
+        $this->path = $path;
+    }
 
     /**
@@ -102 +104 @@
         if(version_compare(PHP_VERSION, '5.3', '>=')){
 
-            require_once '../code-5.3.php'; // Hack. This code is not placed here but in an external file to prevent PHP from parsing the code in versions below 5.3.0 despite the if..else check. See http://stackoverflow.com/questions/17275557/run-a-conditional-using-php-version
+            require_once $this->path.'src/code-5.3.php'; // Hack. This code is not placed here but in an external file to prevent PHP from parsing the code in versions below 5.3.0 despite the if..else check. See http://stackoverflow.com/questions/17275557/run-a-conditional-using-php-version
 
         } else {
@@ -114 +116 @@
                 $image->save( $image_file_dest, $resize_quality );
 
-                return true;
+
             }
             return false;
         }
-
+        return true;
     }
     

cyclone-slider-2/trunk/src/code-5.3.php

@@ -1 +1 @@
 <?php
 // Used in ImageResizer
-$editor = \CycloneSlider\Grafika\Grafika::createEditor();
-$editor->open( $image_file );
-if('fill'==$resize_option){
-    $editor->resizeFill( $width, $height );
-} else if('crop'==$resize_option){
-    $editor->crop( $width, $height );
-} else if('exact'==$resize_option){
-    $editor->resizeExact( $width, $height );
-} else if('exactHeight'==$resize_option){
-    $editor->resizeExactHeight( $height );
-} else if('exactWidth'==$resize_option){
-    $editor->resizeExactWidth( $width );
-} else {
-    $editor->resizeFit( $width, $height );
+try {
+    $editor = \CycloneSlider\Grafika\Grafika::createEditor();
+    $editor->open($image_file);
+    if ('fill' == $resize_option) {
+        $editor->resizeFill($width, $height);
+    } else if ('crop' == $resize_option) {
+        $editor->crop($width, $height);
+    } else if ('exact' == $resize_option) {
+        $editor->resizeExact($width, $height);
+    } else if ('exactHeight' == $resize_option) {
+        $editor->resizeExactHeight($height);
+    } else if ('exactWidth' == $resize_option) {
+        $editor->resizeExactWidth($width);
+    } else {
+        $editor->resizeFit($width, $height);
+    }
+    $editor->save($image_file_dest, null, $resize_quality);
+    return true;
+} catch (Exception $e){
+    return false;
 }
-$editor->save( $image_file_dest, null, $resize_quality );
-
-return true;