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

MINOR merged from trunk

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75937 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-05-04 04:30:32 +00:00 committed by Sam Minnee
parent db6f71a800
commit 5620ba92d1
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/model/VirtualPage.php
View File

@ -104,8 +104,8 @@ class VirtualPage extends Page {
&& $this->changed['CopyContentFromID']
&& $this->CopyContentFromID != 0
&& $this instanceof VirtualPage
) {;
$source = DataObject::get_one("SiteTree","`SiteTree`.`ID`='$this->CopyContentFromID'");
) {
$source = DataObject::get_one("SiteTree",sprintf('`SiteTree`.`ID` = %d', $this->CopyContentFromID));
$this->copyFrom($source);
$this->URLSegment = $source->URLSegment . '-' . $this->ID;
}

6
search/SearchForm.php
View File

@ -105,6 +105,7 @@ class SearchForm extends Form {
// set language (if present)
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) {
$origLocale = Translatable::current_locale();
Translatable::set_reading_locale($data['locale']);
}
@ -135,6 +136,11 @@ class SearchForm extends Form {
if(!$result->canView()) $results->remove($result);
}
// reset locale
if(singleton('SiteTree')->hasExtension('Translatable') && isset($data['locale'])) {
Translatable::set_reading_locale($origLocale);
}
return $results;
}

3
tests/model/TranslatableTest.php
View File

@ -55,6 +55,7 @@ class TranslatableTest extends FunctionalTest {
if(!self::$origTranslatableSettings['has_extension']) Object::remove_extension('SiteTree', 'Translatable');
Translatable::set_default_locale(self::$origTranslatableSettings['default_locale']);
Translatable::set_reading_locale(self::$origTranslatableSettings['default_locale']);
self::kill_temp_db();
self::create_temp_db();
@ -273,7 +274,7 @@ class TranslatableTest extends FunctionalTest {
);
// reset language to default
Translatable::set_reading_locale('de_DE');
Translatable::set_reading_locale('en_US');
}
function testModifyTranslationWithDefaultReadingLang() {