imgix-wordpress / images-via-imgix

imgix.php

Spacing +7 added lines, -7 removed lines

@@ -16,17 +16,17 @@
  * Author URI:  http://github.com/imgix-wordpress
  */
 
-include( 'includes/compability.php' );
-include( 'includes/class-images-via-imgix.php' );
-include( 'includes/options-page.php' );
+include('includes/compability.php');
+include('includes/class-images-via-imgix.php');
+include('includes/options-page.php');
 
-function imgix_plugin_admin_action_links( $links, $file ) {
-	if ( $file === plugin_basename( __FILE__ ) ) {
+function imgix_plugin_admin_action_links($links, $file) {
+	if ($file === plugin_basename(__FILE__)) {
 		$settings_link = '<a href="options-general.php?page=imgix-options">Settings</a>';
-		array_unshift( $links, $settings_link );
+		array_unshift($links, $settings_link);
 	}
 
 	return $links;
 }
 
-add_filter( 'plugin_action_links', 'imgix_plugin_admin_action_links', 10, 2 );
+add_filter('plugin_action_links', 'imgix_plugin_admin_action_links', 10, 2);

includes/compability.php

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  * @package imgix
  */
 
-if ( ! function_exists( 'http_build_url' ) ) {
+if ( ! function_exists('http_build_url')) {
 	/**
 	 * This is a simplified version of http_build_url if pecl_http is missing
 	 *
@@ -13,22 +13,22 @@ 
 	 *
 	 * @return string
 	 */
-	function http_build_url( $parsed_url ) {
-		$scheme   = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
-		$host     = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
-		$port     = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
-		$user     = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
-		$pass     = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
-		$pass     = ( $user || $pass ) ? "$pass@" : '';
-		$path     = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
-		$query    = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
-		$fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : '';
+	function http_build_url($parsed_url) {
+		$scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+		$host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+		$port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
+		$user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+		$pass     = isset($parsed_url['pass']) ? ':' . $parsed_url['pass'] : '';
+		$pass     = ($user || $pass) ? "$pass@" : '';
+		$path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+		$query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
+		$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
 
 		return "$scheme$user$pass$host$port$path$query$fragment";
 	}
 }
 
-if ( ! function_exists( 'wp_get_additional_image_sizes' ) ) {
+if ( ! function_exists('wp_get_additional_image_sizes')) {
 	/**
 	 * Retrieve additional image sizes.
 	 *
@@ -40,7 +40,7 @@ 
 	 */
 	function wp_get_additional_image_sizes() {
 		global $_wp_additional_image_sizes;
-		if ( ! $_wp_additional_image_sizes ) {
+		if ( ! $_wp_additional_image_sizes) {
 			$_wp_additional_image_sizes = [];
 		}
 

includes/options-page.php

Spacing +22 added lines, -22 removed lines

@@ -18,9 +18,9 @@ 
 
 
 	public function __construct() {
-		$this->options = get_option( 'imgix_settings', [] );
-		add_action( 'admin_init', [ $this, 'imgix_register_settings' ] );
-		add_action( 'admin_menu', [ $this, 'imgix_add_options_link' ] );
+		$this->options = get_option('imgix_settings', []);
+		add_action('admin_init', [$this, 'imgix_register_settings']);
+		add_action('admin_menu', [$this, 'imgix_add_options_link']);
 	}
 
 	/**
@@ -29,7 +29,7 @@ 
 	 * @return Imgix_Options_page
 	 */
 	public static function instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -44,62 +44,62 @@ 
 		<div class="wrap">
 
 			<h1>
-				<img src="<?php echo plugins_url( 'assets/images/imgix-logo.png', __DIR__ ); ?>" alt="imgix Logo">
+				<img src="<?php echo plugins_url('assets/images/imgix-logo.png', __DIR__); ?>" alt="imgix Logo">
 			</h1>
 
 			<p><strong>Need help getting started?</strong> It's easy! Check out our
 				<a href="https://github.com/imgix-wordpress/imgix-wordpress#getting-started" target="_blank">instructions.</a>
 			</p>
 
-			<form method="post" action="<?php echo admin_url( 'options.php' ); ?>">
-				<?php settings_fields( 'imgix_settings_group' ); ?>
+			<form method="post" action="<?php echo admin_url('options.php'); ?>">
+				<?php settings_fields('imgix_settings_group'); ?>
 				<table class="form-table">
 					<tbody>
 						<tr>
 							<th>
-								<label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e( 'imgix Source', 'imgix' ); ?>
+								<label class="description" for="imgix_settings[cdn_link]"><?php esc_html_e('imgix Source', 'imgix'); ?>
 							</th>
 							<td>
-								<input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo $this->get_option( 'cdn_link' ); ?>" class="regular-text code"/>
+								<input id="imgix_settings[cdn_link]" type="url" name="imgix_settings[cdn_link]" placeholder="https://yourcompany.imgix.net" value="<?php echo $this->get_option('cdn_link'); ?>" class="regular-text code"/>
 							</td>
 						</tr>
 						<tr>
 							<th>
-								<label class="description" for="imgix_settings[auto_format]"><?php esc_html_e( 'Auto Format Images', 'imgix' ); ?></label>
+								<label class="description" for="imgix_settings[auto_format]"><?php esc_html_e('Auto Format Images', 'imgix'); ?></label>
 							</th>
 							<td>
-								<input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php checked( $this->get_option( 'auto_format' ) ) ?> />
+								<input id="imgix_settings[auto_format]" type="checkbox" name="imgix_settings[auto_format]" value="1" <?php checked($this->get_option('auto_format')) ?> />
 							</td>
 						</tr>
 						<tr>
 							<th>
-								<label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e( 'Auto Enhance Images', 'imgix' ); ?></label>
+								<label class="description" for="imgix_settings[auto_enhance]"><?php esc_html_e('Auto Enhance Images', 'imgix'); ?></label>
 							</th>
 							<td>
-								<input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php checked( $this->get_option( 'auto_enhance' ) ) ?> />
+								<input id="imgix_settings[auto_enhance]" type="checkbox" name="imgix_settings[auto_enhance]" value="1" <?php checked($this->get_option('auto_enhance')) ?> />
 							</td>
 						</tr>
 						<tr>
 							<th>
-								<label class="description" for="imgix_settings[auto_compress]"><?php esc_html_e( 'Auto Compress Images', 'imgix' ); ?></label>
+								<label class="description" for="imgix_settings[auto_compress]"><?php esc_html_e('Auto Compress Images', 'imgix'); ?></label>
 							</th>
 							<td>
-								<input id="imgix_settings[auto_compress]" type="checkbox" name="imgix_settings[auto_compress]" value="1" <?php checked( $this->get_option( 'auto_compress' ) ) ?> />
+								<input id="imgix_settings[auto_compress]" type="checkbox" name="imgix_settings[auto_compress]" value="1" <?php checked($this->get_option('auto_compress')) ?> />
 							</td>
 						</tr>
 						<tr>
 							<th>
-								<label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e( 'Automatically add retina images using srcset', 'imgix' ); ?></label>
+								<label class="description" for="imgix_settings[add_dpi2_srcset]"><?php esc_html_e('Automatically add retina images using srcset', 'imgix'); ?></label>
 							</th>
 							<td>
-								<input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php checked( $this->get_option( 'add_dpi2_srcset' ) ) ?> />
+								<input id="imgix_settings[add_dpi2_srcset]" type="checkbox" name="imgix_settings[add_dpi2_srcset]" value="1" <?php checked($this->get_option('add_dpi2_srcset')) ?> />
 							</td>
 						</tr>
 					</tbody>
 				</table>
 
 				<p class="submit">
-					<input type="submit" class="button-primary" value="<?php esc_html_e( 'Save Options', 'imgix' ); ?>"/>
+					<input type="submit" class="button-primary" value="<?php esc_html_e('Save Options', 'imgix'); ?>"/>
 				</p>
 			</form>
 
@@ -116,14 +116,14 @@ 
 	 *  Adds link to options page in Admin > Settings menu.
 	 */
 	public function imgix_add_options_link() {
-		add_options_page( 'imgix', 'imgix', 'manage_options', 'imgix-options', [ $this, 'imgix_options_page' ] );
+		add_options_page('imgix', 'imgix', 'manage_options', 'imgix-options', [$this, 'imgix_options_page']);
 	}
 
 	/**
 	 *  Creates our settings in the options table.
 	 */
 	public function imgix_register_settings() {
-		register_setting( 'imgix_settings_group', 'imgix_settings' );
+		register_setting('imgix_settings_group', 'imgix_settings');
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function get_option( $key ) {
-		return isset( $this->options[ $key ] ) ? $this->options[ $key ] : '';
+	protected function get_option($key) {
+		return isset($this->options[$key]) ? $this->options[$key] : '';
 	}
 }
 

includes/class-images-via-imgix.php

Spacing +82 added lines, -82 removed lines

@@ -27,20 +27,20 @@ 
 	 * ImagesViaImgix constructor.
 	 */
 	public function __construct() {
-		$this->options = get_option( 'imgix_settings', [] );
+		$this->options = get_option('imgix_settings', []);
 
-		add_filter( 'wp_get_attachment_url', [ $this, 'replace_image_url' ] );
-		add_filter( 'imgix/add-image-url', [ $this, 'replace_image_url' ] );
+		add_filter('wp_get_attachment_url', [$this, 'replace_image_url']);
+		add_filter('imgix/add-image-url', [$this, 'replace_image_url']);
 
-		add_filter( 'image_downsize', [ $this, 'image_downsize' ], 10, 3 );
+		add_filter('image_downsize', [$this, 'image_downsize'], 10, 3);
 
-		add_filter( 'wp_calculate_image_srcset', [ $this, 'calculate_image_srcset' ], 10, 3 );
+		add_filter('wp_calculate_image_srcset', [$this, 'calculate_image_srcset'], 10, 3);
 
-		add_filter( 'the_content', [ $this, 'replace_images_in_content' ] );
-		add_action( 'wp_head', [ $this, 'prefetch_cdn' ], 1 );
+		add_filter('the_content', [$this, 'replace_images_in_content']);
+		add_action('wp_head', [$this, 'prefetch_cdn'], 1);
 
-		add_action( 'after_setup_theme', [ $this, 'buffer_start_for_retina' ] );
-		add_action( 'shutdown', [ $this, 'buffer_end_for_retina' ] );
+		add_action('after_setup_theme', [$this, 'buffer_start_for_retina']);
+		add_action('shutdown', [$this, 'buffer_end_for_retina']);
 	}
 
 	/**
@@ -49,7 +49,7 @@ 
 	 * @return Images_Via_Imgix
 	 */
 	public static function instance() {
-		if ( ! isset( self::$instance ) ) {
+		if ( ! isset(self::$instance)) {
 			self::$instance = new self;
 		}
 
@@ -62,7 +62,7 @@ 
 	 *
 	 * @param array $options
 	 */
-	public function set_options( $options ) {
+	public function set_options($options) {
 		$this->options = $options;
 	}
 
@@ -75,13 +75,13 @@ 
 	 *
 	 * @return string Content with retina-enriched image tags.
 	 */
-	public function add_retina( $content ) {
+	public function add_retina($content) {
 		$pattern = '/<img((?![^>]+srcset )([^>]*)';
 		$pattern .= 'src=[\'"]([^\'"]*imgix.net[^\'"]*\?[^\'"]*w=[^\'"]*)[\'"]([^>]*)*?)>/i';
 		$repl    = '<img$2src="$3" srcset="${3}, ${3}&amp;dpr=2 2x, ${3}&amp;dpr=3 3x,"$4>';
-		$content = preg_replace( $pattern, $repl, $content );
+		$content = preg_replace($pattern, $repl, $content);
 
-		return preg_replace( $pattern, $repl, $content );
+		return preg_replace($pattern, $repl, $content);
 	}
 
 	/**
@@ -91,22 +91,22 @@ 
 	 *
 	 * @return string
 	 */
-	public function replace_image_url( $url ) {
-		if ( ! empty ( $this->options['cdn_link'] ) ) {
-			$parsed_url = parse_url( $url );
-
-			if ( isset( $parsed_url['host'], $parsed_url['path'] ) && $parsed_url['host'] === parse_url( home_url( '/' ), PHP_URL_HOST ) && preg_match( '/\.(jpg|jpeg|gif|png)$/', $parsed_url['path'] ) ) {
-				$cdn = parse_url( $this->options['cdn_link'] );
-				foreach ( [ 'scheme', 'host', 'port' ] as $url_part ) {
-					if ( isset( $cdn[ $url_part ] ) ) {
-						$parsed_url[ $url_part ] = $cdn[ $url_part ];
+	public function replace_image_url($url) {
+		if ( ! empty ($this->options['cdn_link'])) {
+			$parsed_url = parse_url($url);
+
+			if (isset($parsed_url['host'], $parsed_url['path']) && $parsed_url['host'] === parse_url(home_url('/'), PHP_URL_HOST) && preg_match('/\.(jpg|jpeg|gif|png)$/', $parsed_url['path'])) {
+				$cdn = parse_url($this->options['cdn_link']);
+				foreach (['scheme', 'host', 'port'] as $url_part) {
+					if (isset($cdn[$url_part])) {
+						$parsed_url[$url_part] = $cdn[$url_part];
 					} else {
-						unset( $parsed_url[ $url_part ] );
+						unset($parsed_url[$url_part]);
 					}
 				}
-				$url = http_build_url( $parsed_url );
+				$url = http_build_url($parsed_url);
 
-				$url = add_query_arg( $this->get_global_params(), $url );
+				$url = add_query_arg($this->get_global_params(), $url);
 			}
 		}
 
@@ -122,35 +122,35 @@ 
 	 *
 	 * @return false|array
 	 */
-	public function image_downsize( $return, $attachment_id, $size ) {
-		if ( ! empty ( $this->options['cdn_link'] ) ) {
-			$img_url = wp_get_attachment_url( $attachment_id );
+	public function image_downsize($return, $attachment_id, $size) {
+		if ( ! empty ($this->options['cdn_link'])) {
+			$img_url = wp_get_attachment_url($attachment_id);
 
 			$params = [];
-			if ( is_array( $size ) ) {
-				$params['w'] = $width = isset( $size[0] ) ? $size[0] : 0;
-				$params['h'] = $height = isset( $size[1] ) ? $size[1] : 0;
+			if (is_array($size)) {
+				$params['w'] = $width = isset($size[0]) ? $size[0] : 0;
+				$params['h'] = $height = isset($size[1]) ? $size[1] : 0;
 			} else {
 				$available_sizes = $this->get_all_defined_sizes();
-				if ( isset( $available_sizes[ $size ] ) ) {
-					$size        = $available_sizes[ $size ];
+				if (isset($available_sizes[$size])) {
+					$size        = $available_sizes[$size];
 					$params['w'] = $width = $size['width'];
 					$params['h'] = $height = $size['height'];
 				}
 			}
 
-			$params = array_filter( $params );
+			$params = array_filter($params);
 
-			$img_url = add_query_arg( $params, $img_url );
+			$img_url = add_query_arg($params, $img_url);
 
-			if ( ! isset( $width ) || ! isset( $height ) ) {
+			if ( ! isset($width) || ! isset($height)) {
 				// any other type: use the real image
-				$meta   = wp_get_attachment_metadata( $attachment_id );
-				$width  = isset( $width ) ? $width : $meta['width'];
-				$height = isset( $height ) ? $height : $meta['height'];
+				$meta   = wp_get_attachment_metadata($attachment_id);
+				$width  = isset($width) ? $width : $meta['width'];
+				$height = isset($height) ? $height : $meta['height'];
 			}
 
-			$return = [ $img_url, $width, $height, true ];
+			$return = [$img_url, $width, $height, true];
 		}
 
 		return $return;
@@ -165,10 +165,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function calculate_image_srcset( $image_meta, $size_array, $image_src ) {
-		foreach ( $image_meta as $i => $image_size ) {
-			if ( $image_size['descriptor'] === 'w' ) {
-				$image_meta[ $i ]['url'] = add_query_arg( 'w', $image_size['value'], $image_src );
+	public function calculate_image_srcset($image_meta, $size_array, $image_src) {
+		foreach ($image_meta as $i => $image_size) {
+			if ($image_size['descriptor'] === 'w') {
+				$image_meta[$i]['url'] = add_query_arg('w', $image_size['value'], $image_src);
 			}
 		}
 
@@ -182,28 +182,28 @@ 
 	 *
 	 * @return string
 	 */
-	public function replace_images_in_content( $content ) {
-		if ( ! empty ( $this->options['cdn_link'] ) ) {
-			if ( preg_match_all( '/<img\s[^>]*src=([\"\']??)([^\" >]*?)\1[^>]*>/iU', $content, $matches ) ) {
-				foreach ( $matches[2] as $image_src ) {
-					$content = str_replace( $image_src, $this->replace_image_url( $image_src ), $content );
+	public function replace_images_in_content($content) {
+		if ( ! empty ($this->options['cdn_link'])) {
+			if (preg_match_all('/<img\s[^>]*src=([\"\']??)([^\" >]*?)\1[^>]*>/iU', $content, $matches)) {
+				foreach ($matches[2] as $image_src) {
+					$content = str_replace($image_src, $this->replace_image_url($image_src), $content);
 				}
 			}
 
-			if ( preg_match_all( '/<img\s[^>]*srcset=([\"\']??)([^\">]*?)\1[^>]*\/?>/iU', $content, $matches ) ) {
+			if (preg_match_all('/<img\s[^>]*srcset=([\"\']??)([^\">]*?)\1[^>]*\/?>/iU', $content, $matches)) {
 
-				foreach ( $matches[2] as $image_srcset ) {
-					$new_image_srcset = preg_replace_callback( '/(\S+)(\s\d+\w)/', function ( $srcset_matches ) {
-						return $this->replace_image_url( $srcset_matches[1] ) . $srcset_matches[2];
-					}, $image_srcset );
+				foreach ($matches[2] as $image_srcset) {
+					$new_image_srcset = preg_replace_callback('/(\S+)(\s\d+\w)/', function($srcset_matches) {
+						return $this->replace_image_url($srcset_matches[1]) . $srcset_matches[2];
+					}, $image_srcset);
 
-					$content = str_replace( $image_srcset, $new_image_srcset, $content );
+					$content = str_replace($image_srcset, $new_image_srcset, $content);
 				}
 			}
 
-			if ( preg_match_all( '/<a\s[^>]*href=([\"\']??)([^\" >]*?)\1[^>]*>(.*)<\/a>/iU', $content, $matches ) ) {
-				foreach ( $matches[0] as $link ) {
-					$content = str_replace( $link[2], $this->replace_image_url( $link[2] ), $content );
+			if (preg_match_all('/<a\s[^>]*href=([\"\']??)([^\" >]*?)\1[^>]*>(.*)<\/a>/iU', $content, $matches)) {
+				foreach ($matches[0] as $link) {
+					$content = str_replace($link[2], $this->replace_image_url($link[2]), $content);
 				}
 			}
 		}
@@ -215,12 +215,12 @@ 
 	 * Add tag to dns prefetch cdn host
 	 */
 	public function prefetch_cdn() {
-		if ( ! empty ( $this->options['cdn_link'] ) ) {
-			$host = parse_url( $this->options['cdn_link'], PHP_URL_HOST );
+		if ( ! empty ($this->options['cdn_link'])) {
+			$host = parse_url($this->options['cdn_link'], PHP_URL_HOST);
 
 			printf(
 				'<link rel="dns-prefetch" href="%s"/>',
-				esc_attr( '//' . $host )
+				esc_attr('//' . $host)
 			);
 		}
 	}
@@ -229,9 +229,9 @@ 
 	 * Start output buffer if auto retina is enabled
 	 */
 	public function buffer_start_for_retina() {
-		if ( ! empty ( $this->options['add_dpi2_srcset'] ) ) {
+		if ( ! empty ($this->options['add_dpi2_srcset'])) {
 			$this->buffer_started = true;
-			ob_start( [ $this, 'add_retina' ] );
+			ob_start([$this, 'add_retina']);
 		}
 	}
 
@@ -239,7 +239,7 @@ 
 	 * Stop output buffer if it was enabled by the plugin
 	 */
 	public function buffer_end_for_retina() {
-		if ( $this->buffer_started === true ) {
+		if ($this->buffer_started === true) {
 			ob_end_flush();
 		}
 	}
@@ -255,20 +255,20 @@ 
 
 		// For now, only "auto" is supported.
 		$auto = [];
-		if ( ! empty ( $this->options['auto_format'] ) ) {
-			array_push( $auto, 'format' );
+		if ( ! empty ($this->options['auto_format'])) {
+			array_push($auto, 'format');
 		}
 
-		if ( ! empty ( $this->options['auto_enhance'] ) ) {
-			array_push( $auto, 'enhance' );
+		if ( ! empty ($this->options['auto_enhance'])) {
+			array_push($auto, 'enhance');
 		}
 
-		if ( ! empty ( $this->options['auto_compress'] ) ) {
-			array_push( $auto, 'compress' );
+		if ( ! empty ($this->options['auto_compress'])) {
+			array_push($auto, 'compress');
 		}
 
-		if ( ! empty( $auto ) ) {
-			$params['auto'] = implode( '%2C', $auto );
+		if ( ! empty($auto)) {
+			$params['auto'] = implode('%2C', $auto);
 		}
 
 		return $params;
@@ -284,18 +284,18 @@ 
 		$theme_image_sizes = wp_get_additional_image_sizes();
 
 		$sizes = [];
-		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[ $s ] = [ 'width' => '', 'height' => '', 'crop' => false ];
-			if ( isset( $theme_image_sizes[ $s ] ) ) {
+		foreach (get_intermediate_image_sizes() as $s) {
+			$sizes[$s] = ['width' => '', 'height' => '', 'crop' => false];
+			if (isset($theme_image_sizes[$s])) {
 				// For theme-added sizes
-				$sizes[ $s ]['width']  = intval( $theme_image_sizes[ $s ]['width'] );
-				$sizes[ $s ]['height'] = intval( $theme_image_sizes[ $s ]['height'] );
-				$sizes[ $s ]['crop']   = $theme_image_sizes[ $s ]['crop'];
+				$sizes[$s]['width']  = intval($theme_image_sizes[$s]['width']);
+				$sizes[$s]['height'] = intval($theme_image_sizes[$s]['height']);
+				$sizes[$s]['crop']   = $theme_image_sizes[$s]['crop'];
 			} else {
 				// For default sizes set in options
-				$sizes[ $s ]['width']  = get_option( "{$s}_size_w" );
-				$sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
-				$sizes[ $s ]['crop']   = get_option( "{$s}_crop" );
+				$sizes[$s]['width']  = get_option("{$s}_size_w");
+				$sizes[$s]['height'] = get_option("{$s}_size_h");
+				$sizes[$s]['crop']   = get_option("{$s}_crop");
 			}
 		}