Update Kohana code to r3799 from their svn head. All tests pass.

Resolved upstream tickets:
  http://dev.kohanaphp.com/ticket/972

Command:
  svn merge -c19275 vendor/kohana/modified/kohana trunk/kohana

1 files changed, 3 insertions, 3 deletions

diff --git a/kohana/libraries/drivers/Image/GraphicsMagick.php b/kohana/libraries/drivers/Image/GraphicsMagick.php
index a1392c23..8840eb80 100644
--- a/kohana/libraries/drivers/Image/GraphicsMagick.php
+++ b/kohana/libraries/drivers/Image/GraphicsMagick.php
@@ -30,7 +30,7 @@ class Image_GraphicsMagick_Driver extends Image_Driver {
 		if (empty($config['directory']))
 		{
 			// Attempt to locate GM by using "which" (only works for *nix!)
-			if ( ! is_file($path = exec('which gmdisplay')))
+			if ( ! is_file($path = exec('which gm')))
 				throw new Kohana_Exception('image.graphicsmagick.not_found');
 
 			$config['directory'] = dirname($path);
@@ -40,8 +40,8 @@ class Image_GraphicsMagick_Driver extends Image_Driver {
 		$this->ext = (PHP_SHLIB_SUFFIX === 'dll') ? '.exe' : '';
 
 		// Check to make sure the provided path is correct
-		if ( ! is_file(realpath($config['directory']).'/gmdisplay'.$this->ext))
-			throw new Kohana_Exception('image.graphicsmagick.not_found', 'gmdisplay'.$this->ext);
+		if ( ! is_file(realpath($config['directory']).'/gm'.$this->ext))
+			throw new Kohana_Exception('image.graphicsmagick.not_found', 'gm'.$this->ext);
 
 
 		// Set the installation directory