diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php index 63413789..2e46f6ea 100644 --- a/code/CommentAdmin.php +++ b/code/CommentAdmin.php @@ -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') ); diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index c512b3d8..666f818f 100755 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -212,4 +212,4 @@ class ReportAdmin extends LeftAndMain { } } -?> \ No newline at end of file +?> diff --git a/javascript/tinymce.template.js b/javascript/tinymce.template.js index d1ff6390..c38fa2a8 100755 --- a/javascript/tinymce.template.js +++ b/javascript/tinymce.template.js @@ -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]" }); }