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

renamed cmsMainMarkingFilterFunction(), fixed php notice

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42306 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-19 14:04:50 +00:00
parent 78ed0a0795
commit 8fab54429f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/CMSMain.php
View File

@ -136,7 +136,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$className = 'SiteTree'; $className = 'SiteTree';
$rootID = null; $rootID = null;
$obj = $rootID ? $this->getRecord($rootID) : singleton($className); $obj = $rootID ? $this->getRecord($rootID) : singleton($className);
$obj->setMarkingFilterFunction('CMSMainMarkingFilterFunction'); $obj->setMarkingFilterFunction('cmsMainMarkingFilterFunction');
$obj->markPartialTree(); $obj->markPartialTree();
if($p = $this->currentPage()) $obj->markToExpose($p); if($p = $this->currentPage()) $obj->markToExpose($p);
@ -719,7 +719,7 @@ HTML;
* Roll a page back to a previous version * Roll a page back to a previous version
*/ */
function rollback() { function rollback() {
if($_REQUEST['Version']) { if(isset($_REQUEST['Version']) && (bool)$_REQUEST['Version']) {
$record = $this->performRollback($_REQUEST['ID'], $_REQUEST['Version']); $record = $this->performRollback($_REQUEST['ID'], $_REQUEST['Version']);
echo sprintf(_t('CMSMain.ROLLEDBACKVERSION',"Rolled back to version #%d. New version number is #%d"),$_REQUEST['Version'],$record->Version); echo sprintf(_t('CMSMain.ROLLEDBACKVERSION',"Rolled back to version #%d. New version number is #%d"),$_REQUEST['Version'],$record->Version);
} else { } else {
@ -1356,11 +1356,16 @@ JS
* Get the name of the language that we are translating in * Get the name of the language that we are translating in
*/ */
function EditingLang() { function EditingLang() {
if (!Translatable::is_default_lang()) return i18n::get_language_name(Translatable::current_lang()); if(!Translatable::is_default_lang()) {
return i18n::get_language_name(Translatable::current_lang());
} else {
return false;
}
} }
} }
// TODO: Find way to put this in a class // TODO: Find way to put this in a class
function CMSMainMarkingFilterFunction($node) { function cmsMainMarkingFilterFunction($node) {
// Expand all nodes // Expand all nodes
// $node->markingFinished(); // $node->markingFinished();
// Don't ever hide nodes with children, because otherwise if one of their children matches the search, it wouldn't be shown. // Don't ever hide nodes with children, because otherwise if one of their children matches the search, it wouldn't be shown.