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 #4887 from pratikshad/broken-webtest
[civicrm-core.git]
/
CRM
/
Core
/
BAO
/
OptionGroup.php
diff --git
a/CRM/Core/BAO/OptionGroup.php
b/CRM/Core/BAO/OptionGroup.php
index eb526146054479c522f14483719a42ddb1b78706..c03ed0e4dfb087fedf61b705c83be84b05b78937 100644
(file)
--- a/
CRM/Core/BAO/OptionGroup.php
+++ b/
CRM/Core/BAO/OptionGroup.php
@@
-49,7
+49,7
@@
class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
* @param array $defaults
* (reference ) an assoc array to hold the flattened values.
*
* @param array $defaults
* (reference ) an assoc array to hold the flattened values.
*
- * @return CRM_Core_BAO_OptionGroup
object
+ * @return CRM_Core_BAO_OptionGroup
* @static
*/
public static function retrieve(&$params, &$defaults) {
* @static
*/
public static function retrieve(&$params, &$defaults) {
@@
-70,7
+70,8
@@
class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
* @param bool $is_active
* Value we want to set the is_active field.
*
* @param bool $is_active
* Value we want to set the is_active field.
*
- * @return Object DAO object on sucess, null otherwise
+ * @return Object
+ * DAO object on sucess, null otherwise
* @static
*/
public static function setIsActive($id, $is_active) {
* @static
*/
public static function setIsActive($id, $is_active) {
@@
-90,7
+91,7
@@
class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
* @return object
*/
public static function add(&$params, $ids = array()) {
* @return object
*/
public static function add(&$params, $ids = array()) {
- if
(empty($params['id']))
{
+ if
(empty($params['id']))
{
$params['id'] = CRM_Utils_Array::value('optionGroup', $ids);
}
$params['id'] = CRM_Utils_Array::value('optionGroup', $ids);
}
@@
-137,7
+138,8
@@
class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup {
* @param int $optionGroupId
* Id of the Option Group.
*
* @param int $optionGroupId
* Id of the Option Group.
*
- * @return String title
+ * @return String
+ * title
*
* @static
*/
*
* @static
*/