adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge upstream/2.5 into 2.5

Browse source
This commit is contained in:
imsamurai 2013-11-17 21:13:25 +02:00
commit 1d9ecc6c94
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored
View file

@ -9,7 +9,6 @@
*.ctp text
*.sql text
*.md text
*.mo text
*.po text
*.js text
*.css text
@ -30,4 +29,5 @@
*.png binary
*.jpg binary
*.gif binary
*.ico binary
*.ico binary
*.mo binary

1
lib/Cake/Model/Datasource/Database/Mysql.php
View file

@ -118,7 +118,6 @@ class Mysql extends DboSource {
'biginteger' => array('name' => 'bigint', 'limit' => '20'),
'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'),
'float' => array('name' => 'float', 'formatter' => 'floatval'),
'numeric' => array('name' => 'decimal', 'formatter' => 'floatval'),
'decimal' => array('name' => 'decimal', 'formatter' => 'floatval'),
'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),