Merge branch 'master' of git://github.com/myrho/horde into myrho-master

Signed-off-by: Jan Schneider <jan@horde.org>
horde · Mar 3, 2014 · 0df689e · 0df689e
2 parents 849696b + 0785697
commit 0df689e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/Db/lib/Horde/Db/Adapter/Base/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Base/Schema.php
@@ -900,7 +900,7 @@ public function typeToSql($type, $limit = null, $precision = null,
 
         $sql = is_array($native) ? $native['name'] : $native;
         if ($type == 'decimal' ||
-            isset($native['precision']) || isset($native['scale']) ||
+            is_array($native) && (isset($native['precision']) || isset($native['scale'])) ||
             isset($precision) || isset($scale)) {
             $nativePrec  = isset($native['precision']) ? $native['precision'] : null;
             $nativeScale = isset($native['scale'])     ? $native['scale']     : null;