tonyair/silverstripe-translatable
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-translatable synced 2024-10-22 11:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #201 from dhensby/pulls/travis-update

Browse Source 
Compatibility with 4.x-dev
This commit is contained in:
Damian Mooyman 2015-11-04 09:57:28 +13:00
commit b120f26484
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -2,7 +2,7 @@
language: php language: php
php: php:
- 5.3 - 5.5
sudo: false sudo: false
@ -12,7 +12,7 @@ env:
matrix: matrix:
include: include:
- php: 5.4 - php: 5.6
env: DB=MYSQL CORE_RELEASE=master env: DB=MYSQL CORE_RELEASE=master
before_script: before_script:

8
code/model/Translatable.php
View File

@ -433,7 +433,7 @@ class Translatable extends DataExtension implements PermissionProvider {
$translationGroupID = $this->getTranslationGroup(); $translationGroupID = $this->getTranslationGroup();
if(is_numeric($translationGroupID)) { if(is_numeric($translationGroupID)) {
$query = new SQLQuery( $query = new SQLSelect(
'DISTINCT "Locale"', 'DISTINCT "Locale"',
sprintf( sprintf(
'"%s" LEFT JOIN "%s" ON "%s"."OriginalID" = "%s"."ID"', '"%s" LEFT JOIN "%s" ON "%s"."OriginalID" = "%s"."ID"',
@ -583,9 +583,9 @@ class Translatable extends DataExtension implements PermissionProvider {
} }
/** /**
* Check if a given SQLQuery filters on the Locale field * Check if a given SQLSelect filters on the Locale field
* *
* @param SQLQuery $query * @param SQLSelect $query
* @return boolean * @return boolean
*/ */
protected function filtersOnLocale($query) { protected function filtersOnLocale($query) {
@ -1634,7 +1634,7 @@ class Translatable extends DataExtension implements PermissionProvider {
*/ */
static function get_existing_content_languages($className = 'SiteTree', $where = '') { static function get_existing_content_languages($className = 'SiteTree', $where = '') {
$baseTable = ClassInfo::baseDataClass($className); $baseTable = ClassInfo::baseDataClass($className);
$query = new SQLQuery("Distinct \"Locale\"","\"$baseTable\"",$where, '', "\"Locale\""); $query = new SQLSelect("Distinct \"Locale\"","\"$baseTable\"",$where, '', "\"Locale\"");
$dbLangs = $query->execute()->column(); $dbLangs = $query->execute()->column();
$langlist = array_merge((array)Translatable::default_locale(), (array)$dbLangs); $langlist = array_merge((array)Translatable::default_locale(), (array)$dbLangs);
$returnMap = array(); $returnMap = array();