projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3317 from eileenmcnaughton/CRM-14197-postprocesfn
[civicrm-core.git]
/
CRM
/
Campaign
/
Form
/
Survey.php
diff --git
a/CRM/Campaign/Form/Survey.php
b/CRM/Campaign/Form/Survey.php
index df7318d1870dc8fd86058e390f607a3fda42e889..07f7274774dcef5b7549371a1ffe03d08bb2d71e 100644
(file)
--- a/
CRM/Campaign/Form/Survey.php
+++ b/
CRM/Campaign/Form/Survey.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-171,9
+171,11
@@
class CRM_Campaign_Form_Survey extends CRM_Core_Form {
}
}
}
}
+ /**
+ * @return string
+ */
function getTemplateFileName() {
function getTemplateFileName() {
- if ($this->controller->getPrint() == CRM_Core_Smarty::PRINT_NOFORM ||
- $this->getVar('_surveyId') <= 0 ) {
+ if ($this->controller->getPrint() || $this->getVar('_surveyId') <= 0 ) {
return parent::getTemplateFileName();
}
else {
return parent::getTemplateFileName();
}
else {