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

Merged from branches/2.3

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79439 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-06-17 11:50:02 +00:00
parent 3f9fd08ceb
commit d82ba048bf
4 changed files with 67 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/sitefeatures/PageComment.php
View File

@ -209,8 +209,8 @@ class PageComment_Controller extends Controller {
if(Permission::check('CMS_ACCESS_CMSMain')) {
// if spam protection module exists
if(class_exists('SpamProtecterManager')) {
SpamProtecterManager::send_feedback($comment, 'spam');
if(class_exists('SpamProtectorManager')) {
SpamProtectorManager::send_feedback($comment, 'spam');
$comment->setField('IsSpam', true);
$comment->write();
}
@ -252,8 +252,8 @@ class PageComment_Controller extends Controller {
if(Permission::check('CMS_ACCESS_CMSMain')) {
// if spam protection module exists
if(class_exists('SpamProtecterManager')) {
SpamProtecterManager::send_feedback($comment, 'ham');
if(class_exists('SpamProtectorManager')) {
SpamProtectorManager::send_feedback($comment, 'ham');
$comment->setField('IsSpam', false);
$comment->write();
}

4
code/sitefeatures/PageCommentInterface.php
View File

@ -181,9 +181,9 @@ class PageCommentInterface extends RequestHandler {
$form->setRedirectToFormOnValidationError(true);
// Optional Spam Protection.
if(class_exists('SpamProtecterManager')) {
if(class_exists('SpamProtectorManager')) {
// Update the form to add the protecter field to it
$protecter = SpamProtecterManager::update_form($form);
$protecter = SpamProtectorManager::update_form($form);
if($protecter) {
$protecter->setFieldMapping('Name', 'Comment');

2
javascript/CMSMain_upload.js
View File

@ -14,9 +14,7 @@ CMSMain_upload.prototype = {
if(pv.major < 9) return;
// Due to a bug in the flash plugin on Linux and Mac, we need at least version 9.0.64 to use SWFUpload
if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
if(pv.major == 9 && pv.minor == 0 && pv.rev < 64) return;
}
// If those 2 checks pass, we can provide upload capabilities to the user
this.iframe = window.top.document.getElementById('AssetAdmin_upload');

2
javascript/TinyMCEImageEnhancement.js
View File

@ -123,7 +123,6 @@ TinyMCEImageEnhancement.prototype = {
// Due to a bug in the flash plugin on Linux and Mac,
//we need at least version 9.0.64 to use SWFUpload
// see http://open.silverstripe.com/ticket/3023
if(navigator.appVersion.indexOf("Mac") != -1 || navigator.appVersion.indexOf("X11") != -1 || navigator.appVersion.indexOf("Linux") != -1) {
pv = getFlashPlayerVersion();
if(pv.major < 9 || pv.major > 9 || (pv.major == 9 && pv.minor == 0 && pv.rev < 64)) {
if($('AddFolderGroup')) $('AddFolderGroup').style.display = 'none';
@ -131,7 +130,6 @@ TinyMCEImageEnhancement.prototype = {
if($('UploadGroup')) $('UploadGroup').style.display = 'none';
return;
}
}
if($('FolderID') != null) {
if($('SecurityID')) var securityid=$('SecurityID').value;