diff options
author | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
---|---|---|
committer | Siebrand Mazeland <s.mazeland@xs4all.nl> | 2009-11-08 23:33:58 +0100 |
commit | b10f362ede8c39746c168363bf4fa6481995592b (patch) | |
tree | c7a6d4d2ca280ba50d1dbac1113507432e3fe12e /extlib/MIME | |
parent | 5ab709b73977131813884558bf56d97172a7aa26 (diff) | |
parent | fc5002015b2a9e16a3c6b9992d55b45c73a8d2fb (diff) |
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Diffstat (limited to 'extlib/MIME')
-rw-r--r-- | extlib/MIME/Type.php | 4 | ||||
-rw-r--r-- | extlib/MIME/Type/Extension.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extlib/MIME/Type.php b/extlib/MIME/Type.php index 8653362d3..c335f8d92 100644 --- a/extlib/MIME/Type.php +++ b/extlib/MIME/Type.php @@ -478,7 +478,7 @@ class MIME_Type // Don't return an empty string if (!$type || !strlen($type)) { - return PEAR::raiseError("Sorry. Could not determine file type."); + return PEAR::raiseError("Sorry, couldn't determine file type."); } // Strip parameters if present & requested @@ -510,7 +510,7 @@ class MIME_Type $fileCmd = PEAR::getStaticProperty('MIME_Type', 'fileCmd'); if (!$cmd->which($fileCmd)) { unset($cmd); - return PEAR::raiseError("Cannot find file command \"{$fileCmd}\""); + return PEAR::raiseError("Can't find file command \"{$fileCmd}\""); } $cmd->pushCommand($fileCmd, "-bi " . escapeshellarg($file)); diff --git a/extlib/MIME/Type/Extension.php b/extlib/MIME/Type/Extension.php index 2ffdee9a9..1987e2a10 100644 --- a/extlib/MIME/Type/Extension.php +++ b/extlib/MIME/Type/Extension.php @@ -265,7 +265,7 @@ class MIME_Type_Extension } if (!isset($this->extensionToType[$extension])) { - return PEAR::raiseError("Sorry. Could not determine file type."); + return PEAR::raiseError("Sorry, couldn't determine file type."); } return $this->extensionToType[$extension]; @@ -288,7 +288,7 @@ class MIME_Type_Extension $extension = array_search($type, $this->extensionToType); if ($extension === false) { - return PEAR::raiseError("Sorry. Could not determine extension."); + return PEAR::raiseError("Sorry, couldn't determine extension."); } return $extension; } |