tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into 3.1

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Ingo Schommer 2013-05-17 13:50:40 +02:00
commit 8bf2f16c75
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/Database.php
View File

@ -847,7 +847,7 @@ abstract class SS_Database {
$combinedLimit = $limit['start'] ? "$limit[limit] OFFSET $limit[start]" : "$limit[limit]";
} elseif(isset($limit['limit']) && is_numeric($limit['limit'])) {
$combinedLimit = (int) $limit['limit'];
$combinedLimit = (int)$limit['limit'];
} else {
$combinedLimit = false;
}
@ -1007,9 +1007,9 @@ abstract class SS_Database {
*/
public function supportsLocks() {
return false;
}
}
/**
/**
* Returns if the lock is available.
* See {@link supportsLocks()} to check if locking is generally supported.
*

2
tests/core/CoreTest.php
View File

@ -21,6 +21,8 @@ class CoreTest extends SapphireTest {
if(file_exists($this->tempPath)) {
$this->assertEquals(getTempFolder(BASE_PATH), $this->tempPath . '/' . $user);
} else {
$user = getTempFolderUsername();
// A typical Windows location for where sites are stored on IIS
$this->assertEquals(sys_get_temp_dir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project/' . $user,
getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'));