adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-04 18:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.5

Browse source
This commit is contained in:
ADmad 2014-03-16 20:17:24 +05:30
commit 961f9d7669
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Model/Datasource/Database/Sqlserver.php
View file

@ -205,7 +205,8 @@ class Sqlserver extends DboSource {
return $cache;
}
$fields = array();
$table = $this->fullTableName($model, false);
$table = $this->fullTableName($model, false, false);
$schema = $model->schemaName;
$cols = $this->_execute(
"SELECT
COLUMN_NAME as Field,
@ -216,7 +217,7 @@ class Sqlserver extends DboSource {
COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key],
NUMERIC_SCALE as Size
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_NAME = '" . $table . "'"
WHERE TABLE_NAME = '" . $table . "'" . ($schema ? " AND TABLE_SCHEMA = '" . $schema . "'" : '')
);
if (!$cols) {
throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));

5
lib/Cake/Network/Email/CakeEmail.php
View file

@ -1,7 +1,5 @@
<?php
/**
* CakePHP Email
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
@ -1029,9 +1027,10 @@ class CakeEmail {
}
$fileInfo['data'] = chunk_split(base64_encode($fileInfo['data']), 76, "\r\n");
} else {
$fileName = $fileInfo['file'];
$fileInfo['file'] = realpath($fileInfo['file']);
if ($fileInfo['file'] === false || !file_exists($fileInfo['file'])) {
throw new SocketException(__d('cake_dev', 'File not found: "%s"', $fileInfo['file']));
throw new SocketException(__d('cake_dev', 'File not found: "%s"', $fileName));
}
if (is_int($name)) {
$name = basename($fileInfo['file']);