diff options
Diffstat (limited to 'kohana/libraries/drivers')
| -rw-r--r-- | kohana/libraries/drivers/Database/Mssql.php | 4 | ||||
| -rw-r--r-- | kohana/libraries/drivers/Image/GraphicsMagick.php | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kohana/libraries/drivers/Database/Mssql.php b/kohana/libraries/drivers/Database/Mssql.php index 644d4a13..401770a2 100644 --- a/kohana/libraries/drivers/Database/Mssql.php +++ b/kohana/libraries/drivers/Database/Mssql.php @@ -58,7 +58,9 @@ class Database_Mssql_Driver extends Database_Driver // Build the connection info $host = isset($host) ? $host : $socket; - $port = (isset($port) AND is_string($port)) ? ':'.$port : ''; + + // Windows uses a comma instead of a colon + $port = (isset($port) AND is_string($port)) ? (KOHANA_IS_WIN ? ',' : ':').$port : ''; // Make the connection and select the database if (($this->link = $connect($host.$port, $user, $pass, TRUE)) AND mssql_select_db($database, $this->link)) 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 |