fix some merge conflicts

humanmade · Jul 1, 2015 · 2296511 · 2296511
1 parent 5b33f3b
commit 2296511
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/hm-image-placeholders.php b/hm-image-placeholders.php
@@ -32,4 +32,4 @@
 	HM_Image_Placeholders_Admin::get_instance();
 }
 
-HM_Image_Placeholders::get_instance();
+Plugin::get_instance();
diff --git a/inc/class-hm-image-placeholders-admin.php b/inc/class-hm-image-placeholders-admin.php
@@ -1,4 +1,6 @@
-<?php namespace HMImagePlaceholders;
+<?php
+
+namespace HM_Image_Placeholder;
 
 class HM_Image_Placeholders_Admin {
 

diff --git a/inc/class-plugin.php b/inc/class-plugin.php
@@ -1,4 +1,4 @@
-<?php namespace HMImagePlaceholders;
+<?php
 
 namespace HM_Image_Placeholder;
 
@@ -56,7 +56,7 @@ public function plugins_loaded() {
 	 */
 	function filter_wp_get_attachment_image_attributes( $attr, $attachment, $size ) {
 
-		$colors_hex = $this->get_colors_for_attachment( $id );
+		$colors_hex = $this->get_colors_for_attachment( $attachment->ID );
 
 		if ( ! $colors_hex ) {
 			return $attr;
@@ -139,7 +139,7 @@ public function filter_wp_generate_attachment_metadata( $metadata, $attachment_i
 	 */
 	public function get_colors_for_attachment( $id ) {
 
-		return get_post_meta( $attachment->ID, 'hmgp_image_colors', true );
+		return get_post_meta( $id, 'hmgp_image_colors', true );
 
 	}