tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity

Merged from branches/2.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77020 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-17 23:15:31 +00:00
parent 4ded1f4930
commit 161e7a35c7
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Requirements.php
View File

@ -886,7 +886,8 @@ class Requirements_Backend {
$fileContent = JSMin::minify($fileContent); $fileContent = JSMin::minify($fileContent);
} }
// write a header comment for each file for easier identification and debugging // write a header comment for each file for easier identification and debugging
$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n\n"; // also the semicolon between each file is required for jQuery to be combinable properly
$combinedData .= "/****** FILE: $file *****/\n" . $fileContent . "\n;\n";
} }
if(!file_exists(dirname($base . $combinedFile))) { if(!file_exists(dirname($base . $combinedFile))) {
Filesystem::makeFolder(dirname($base . $combinedFile)); Filesystem::makeFolder(dirname($base . $combinedFile));

2
core/model/DataObject.php
View File

@ -2156,7 +2156,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return boolean * @return boolean
*/ */
public function canCreate($member = null) { public function canCreate($member = null) {
return Permission::check('ADMIN', 'any', $member);; return Permission::check('ADMIN', 'any', $member);
} }
/** /**

4
core/model/Hierarchy.php
View File

@ -136,8 +136,8 @@ class Hierarchy extends DataObjectDecorator {
} else { } else {
return ($node->$parameterName == $this->markingFilter['value']); return ($node->$parameterName == $this->markingFilter['value']);
} }
} else if ($funcName = $this->markingFilter['func']) { } else if ($func = $this->markingFilter['func']) {
return $funcName($node); return call_user_func($func, $node);
} }
} }

2
core/model/SiteTree.php
View File

@ -1127,6 +1127,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if($this->ID && is_numeric($this->ID)) { if($this->ID && is_numeric($this->ID)) {
$linkedPages = DataObject::get("VirtualPage", "\"CopyContentFromID\" = $this->ID"); $linkedPages = DataObject::get("VirtualPage", "\"CopyContentFromID\" = $this->ID");
} }
$parentPageLinks = array();
if(isset($linkedPages)) { if(isset($linkedPages)) {
foreach($linkedPages as $linkedPage) { foreach($linkedPages as $linkedPage) {

7
core/model/Translatable.php
View File

@ -244,7 +244,12 @@ class Translatable extends DataObjectDecorator {
* @param $locale String * @param $locale String
*/ */
static function set_default_locale($locale) { static function set_default_locale($locale) {
self::$default_locale = $locale; $localeList = i18n::get_locale_list();
if(isset($localeList[$locale])) {
self::$default_locale = $locale;
} else {
user_error("Translatable::set_default_locale(): '$locale' is not a valid locale.", E_USER_WARNING);
}
} }
/** /**