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

Conflicts:
	README.md
	composer.json
	docs/en/installation/from-source.md
	docs/en/misc/contributing.md
	model/Database.php
This commit is contained in:
Ingo Schommer 2013-05-17 00:37:30 +02:00
commit 79cf1faf53
3 changed files with 31 additions and 31 deletions

View File

@ -1,6 +1,6 @@
## SilverStripe Framework
[![Build Status](https://secure.travis-ci.org/silverstripe/sapphire.png?branch=3.0)](https://travis-ci.org/silverstripe/sapphire)
[![Build Status](https://secure.travis-ci.org/silverstripe/silverstripe-framework.png?branch=3.0)](https://travis-ci.org/silverstripe/silverstripe-framework)
PHP5 framework forming the base for the SilverStripe CMS ([http://silverstripe.org](http://silverstripe.org)).
Requires a [`silverstripe-installer`](http://github.com/silverstripe/silverstripe-installer) base project. Typically used alongside the [`cms`](http://github.com/silverstripe/silverstripe-cms) module.

View File

@ -840,7 +840,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;
}
@ -986,9 +986,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.
*