projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-01-20-54-24
[civicrm-core.git]
/
CRM
/
SMS
/
Form
/
Upload.php
diff --git
a/CRM/SMS/Form/Upload.php
b/CRM/SMS/Form/Upload.php
index 3a9476bde5db65a49dd396a893da2a08c57e5b82..37d24a0c2ab697992e39e6cf60130f2ab06b29dd 100644
(file)
--- a/
CRM/SMS/Form/Upload.php
+++ b/
CRM/SMS/Form/Upload.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$
*
*/
@@
-292,6
+292,9
@@
class CRM_SMS_Form_Upload extends CRM_Core_Form {
*
* @param array $params (ref.) an assoc array of name/value pairs
*
*
* @param array $params (ref.) an assoc array of name/value pairs
*
+ * @param $files
+ * @param $self
+ *
* @return mixed true or array of errors
* @access public
* @static
* @return mixed true or array of errors
* @access public
* @static
@@
-352,7
+355,7
@@
class CRM_SMS_Form_Upload extends CRM_Core_Form {
}
}
}
}
}
}
- if (!empty($params['saveTemplate']) &&
!CRM_Utils_Array::value('saveTemplateName', $params
)) {
+ if (!empty($params['saveTemplate']) &&
empty($params['saveTemplateName']
)) {
$errors['saveTemplateName'] = ts('Please provide a Template Name.');
}
}
$errors['saveTemplateName'] = ts('Please provide a Template Name.');
}
}