@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | /** @api |
| 66 | 66 | * @var string for people who like trackback spam |
| 67 | - */ |
|
| 67 | + */ |
|
| 68 | 68 | public $pingback_url; |
| 69 | 69 | public $siteurl; |
| 70 | 70 | /** |
@@ -333,7 +333,7 @@ |
||
| 333 | 333 | $suffix = '</p>'; |
| 334 | 334 | $desc = term_description( $this->ID, $this->taxonomy ); |
| 335 | 335 | if (substr($desc, 0, strlen($prefix)) == $prefix) { |
| 336 | - $desc = substr($desc, strlen($prefix)); |
|
| 336 | + $desc = substr($desc, strlen($prefix)); |
|
| 337 | 337 | } |
| 338 | 338 | $desc = preg_replace('/'. preg_quote('</p>', '/') . '$/', '', $desc); |
| 339 | 339 | return trim($desc); |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Contains the class for running image retina-izing operations |
|
| 4 | - */ |
|
| 3 | + * Contains the class for running image retina-izing operations |
|
| 4 | + */ |
|
| 5 | 5 | |
| 6 | 6 | /** |
| 7 | 7 | * Increases image size by a given factor |
@@ -11,64 +11,64 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | class TimberImageOperationRetina extends TimberImageOperation { |
| 13 | 13 | |
| 14 | - private $factor; |
|
| 14 | + private $factor; |
|
| 15 | 15 | |
| 16 | - /** |
|
| 17 | - * Construct our operation |
|
| 18 | - * @param float $factor to multiply original dimensions by |
|
| 19 | - */ |
|
| 20 | - function __construct($factor) { |
|
| 21 | - $this->factor = $factor; |
|
| 22 | - } |
|
| 16 | + /** |
|
| 17 | + * Construct our operation |
|
| 18 | + * @param float $factor to multiply original dimensions by |
|
| 19 | + */ |
|
| 20 | + function __construct($factor) { |
|
| 21 | + $this->factor = $factor; |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * Generates the final filename based on the source's name and extension |
|
| 26 | - * |
|
| 27 | - * @param string $src_filename the basename of the file (ex: my-awesome-pic) |
|
| 28 | - * @param string $src_extension the extension (ex: .jpg) |
|
| 29 | - * @return string the final filename to be used (ex: [email protected]) |
|
| 30 | - */ |
|
| 31 | - function filename($src_filename, $src_extension) { |
|
| 32 | - $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc. |
|
| 33 | - $new_name = $newbase . '.' . $src_extension; |
|
| 34 | - return $new_name; |
|
| 35 | - } |
|
| 24 | + /** |
|
| 25 | + * Generates the final filename based on the source's name and extension |
|
| 26 | + * |
|
| 27 | + * @param string $src_filename the basename of the file (ex: my-awesome-pic) |
|
| 28 | + * @param string $src_extension the extension (ex: .jpg) |
|
| 29 | + * @return string the final filename to be used (ex: [email protected]) |
|
| 30 | + */ |
|
| 31 | + function filename($src_filename, $src_extension) { |
|
| 32 | + $newbase = $src_filename . '@' . $this->factor . 'x'; // add @2x, @3x, @1.5x, etc. |
|
| 33 | + $new_name = $newbase . '.' . $src_extension; |
|
| 34 | + return $new_name; |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Performs the actual image manipulation, |
|
| 39 | - * including saving the target file. |
|
| 40 | - * |
|
| 41 | - * @param string $load_filename filepath (not URL) to source file |
|
| 42 | - * (ex: /src/var/www/wp-content/uploads/my-pic.jpg) |
|
| 43 | - * @param string $save_filename filepath (not URL) where result file should be saved |
|
| 44 | - * (ex: /src/var/www/wp-content/uploads/[email protected]) |
|
| 45 | - * @return bool true if everything went fine, false otherwise |
|
| 46 | - */ |
|
| 47 | - function run($load_filename, $save_filename){ |
|
| 48 | - $image = wp_get_image_editor( $load_filename ); |
|
| 49 | - if ( !is_wp_error( $image ) ) { |
|
| 50 | - $current_size = $image->get_size(); |
|
| 51 | - $src_w = $current_size['width']; |
|
| 52 | - $src_h = $current_size['height']; |
|
| 53 | - // Get ratios |
|
| 54 | - $w = $src_w * $this->factor; |
|
| 55 | - $h = $src_h * $this->factor; |
|
| 56 | - $image->crop( 0, 0, $src_w, $src_h, $w, $h ); |
|
| 57 | - $result = $image->save( $save_filename ); |
|
| 58 | - if ( is_wp_error( $result ) ) { |
|
| 59 | - // @codeCoverageIgnoreStart |
|
| 37 | + /** |
|
| 38 | + * Performs the actual image manipulation, |
|
| 39 | + * including saving the target file. |
|
| 40 | + * |
|
| 41 | + * @param string $load_filename filepath (not URL) to source file |
|
| 42 | + * (ex: /src/var/www/wp-content/uploads/my-pic.jpg) |
|
| 43 | + * @param string $save_filename filepath (not URL) where result file should be saved |
|
| 44 | + * (ex: /src/var/www/wp-content/uploads/[email protected]) |
|
| 45 | + * @return bool true if everything went fine, false otherwise |
|
| 46 | + */ |
|
| 47 | + function run($load_filename, $save_filename){ |
|
| 48 | + $image = wp_get_image_editor( $load_filename ); |
|
| 49 | + if ( !is_wp_error( $image ) ) { |
|
| 50 | + $current_size = $image->get_size(); |
|
| 51 | + $src_w = $current_size['width']; |
|
| 52 | + $src_h = $current_size['height']; |
|
| 53 | + // Get ratios |
|
| 54 | + $w = $src_w * $this->factor; |
|
| 55 | + $h = $src_h * $this->factor; |
|
| 56 | + $image->crop( 0, 0, $src_w, $src_h, $w, $h ); |
|
| 57 | + $result = $image->save( $save_filename ); |
|
| 58 | + if ( is_wp_error( $result ) ) { |
|
| 59 | + // @codeCoverageIgnoreStart |
|
| 60 | 60 | TimberHelper::error_log( 'Error resizing image' ); |
| 61 | 61 | TimberHelper::error_log( $result ); |
| 62 | 62 | return false; |
| 63 | 63 | // @codeCoverageIgnoreEnd |
| 64 | - } else { |
|
| 65 | - return true; |
|
| 66 | - } |
|
| 67 | - } else if ( isset( $image->error_data['error_loading_image'] ) ) { |
|
| 68 | - TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] ); |
|
| 69 | - } else { |
|
| 70 | - TimberHelper::error_log( $image ); |
|
| 71 | - } |
|
| 72 | - return false; |
|
| 73 | - } |
|
| 64 | + } else { |
|
| 65 | + return true; |
|
| 66 | + } |
|
| 67 | + } else if ( isset( $image->error_data['error_loading_image'] ) ) { |
|
| 68 | + TimberHelper::error_log( 'Error loading ' . $image->error_data['error_loading_image'] ); |
|
| 69 | + } else { |
|
| 70 | + TimberHelper::error_log( $image ); |
|
| 71 | + } |
|
| 72 | + return false; |
|
| 73 | + } |
|
| 74 | 74 | } |
@@ -15,12 +15,12 @@ |
||
| 15 | 15 | // then in the wp-content dir (site install). |
| 16 | 16 | // and finally in the current themes directories. |
| 17 | 17 | if ( file_exists( $composer_autoload = __DIR__ . '/vendor/autoload.php' ) /* check in self */ |
| 18 | - || file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */ |
|
| 19 | - || file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */ |
|
| 20 | - || file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */ |
|
| 21 | - || file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */ |
|
| 18 | + || file_exists( $composer_autoload = WP_CONTENT_DIR.'/vendor/autoload.php') /* check in wp-content */ |
|
| 19 | + || file_exists( $composer_autoload = plugin_dir_path( __FILE__ ).'vendor/autoload.php') /* check in plugin directory */ |
|
| 20 | + || file_exists( $composer_autoload = get_stylesheet_directory().'/vendor/autoload.php') /* check in child theme */ |
|
| 21 | + || file_exists( $composer_autoload = get_template_directory().'/vendor/autoload.php') /* check in parent theme */ |
|
| 22 | 22 | ) { |
| 23 | - require_once $composer_autoload; |
|
| 23 | + require_once $composer_autoload; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | $timber = new Timber(); |