Merge branch 'DBAL-388' into 2.3

587b5510 · Benjamin Eberlei · 4f535bb4 · c1d883d3 · 587b5510
Commit 587b5510 authored May 09, 2013 by Benjamin Eberlei
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

BlobType.php lib/Doctrine/DBAL/Types/BlobType.php +5 -1

No files found.
--- a/lib/Doctrine/DBAL/Types/BlobType.php
+++ b/lib/Doctrine/DBAL/Types/BlobType.php
@@ -47,11 +47,15 @@ class BlobType extends Type
        if (null === $value) {
            return null;
        }
+
        if (is_string($value)) {
            $value = fopen('data://text/plain;base64,' . base64_encode($value), 'r');
-        } else if ( ! is_resource($value)) {
+        } 
+        
+        if ( ! is_resource($value)) {
            throw ConversionException::conversionFailed($value, self::BLOB);
        }
+
        return $value;
    }