Merge pull request #31 from krolow/develop

Merging develop
krolow · Aug 27, 2014 · 8d89d69 · 8d89d69
2 parents 1a2d130 + 80c40d9
commit 8d89d69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Model/Behavior/UploadBehavior.php b/Model/Behavior/UploadBehavior.php
@@ -87,7 +87,7 @@ protected function _setRelationModel(Model $model, $type) {
 			'dependent' => true,
 			'conditions' => array(
 				'Attachment' . $type . '.model' => $model->alias,
-				'Attachment' . $type . '.type' => strtolower($type)),
+				'Attachment' . $type . '.type' => Inflector::underscore($type)),
 			'fields' => '',
 			'order' => ''
 		);
@@ -642,11 +642,11 @@ public function createThumbs(Model $model, $type, $file) {
  *
  * @return void
  */
-	public function createThumb($file, $name, $width, $height, $crop = false) {
-		$imagine = $this->getImagine();
+	public function createThumb(Model $model, $file, $name, $width, $height, $crop = false) {
+		$imagine = $this->getImagine($model);
 		$image = $imagine->open($file);
 
-		$this->__generateThumb(
+		$this->_generateThumb(
 			array(
 				'w' => $width,
 				'h' => $height,
@@ -696,7 +696,7 @@ protected function _generateThumb($thumb, $image, $crop = false) {
 			$mode = Imagine\Image\ImageInterface::THUMBNAIL_INSET;
 		}
 
-		$thumbnail = $image->thumbnail(
+        $thumbnail = $image->thumbnail(
 			new Imagine\Image\Box(
 				$thumb['w'],
 				$thumb['h']

diff --git a/View/Helper/AttachHelper.php b/View/Helper/AttachHelper.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Attachment Model
- * 
+ *
  * PHP Version 5.3+
  *
  * @version       1.0
@@ -14,7 +14,7 @@ class AttachHelper extends AppHelper {
 
 /**
  * Load Helpers
- * 
+ *
  * @var array
  */
 	public $helpers = array(
@@ -23,14 +23,14 @@ class AttachHelper extends AppHelper {
 
 /**
  * Render image
- * 
+ *
  * @throws RunTimeException When no model is set in data or class does not exists
- * 
+ *
  * @return string
  */
 	public function image($attach, $type = null, $options = array()) {
 		if (!isset($attach['model'])) {
-			throw new RunTimeException('Seems that the given attac is not really from the Attachment model');
+			throw new RunTimeException('Seems that the given attach is not really from the Attachment model');
 		}
 
 		if (!class_exists($attach['model'])) {