tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-07-01 17:09:21 +02:00
Code Issues Projects Releases Wiki Activity

Merged from branches/2.2

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72813 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-03-10 22:26:22 +00:00
parent 550931c02a
commit 61d312643e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CommentAdmin.php
View File

@ -70,7 +70,7 @@ class CommentAdmin extends LeftAndMain {
$tableFields = array(
"Name" => _t('CommentAdmin.AUTHOR', 'Author'),
"Comment" => _t('CommentAdmin.COMMENT', 'Comment'),
"PageTitle" => _t('CommentAdmin.PAGE', 'Page'),
"Parent.Title" => _t('CommentAdmin.PAGE', 'Page'),
"Created" => _t('CommentAdmin.DATEPOSTED', 'Date Posted')
);

2
code/ReportAdmin.php
View File

@ -212,4 +212,4 @@ class ReportAdmin extends LeftAndMain {
}
}
?>
?>

3
javascript/tinymce.template.js
View File

@ -41,7 +41,8 @@ if((typeof tinyMCE != 'undefined')) {
safari_warning : false,
relative_urls : true,
verify_html : true,
use_native_selects : true // fancy selects are bug as of SS 2.3.0
use_native_selects : true, // fancy selects are bug as of SS 2.3.0
extended_valid_elements : "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling]"
});
}