gctools-outilsgc /
gcconnex
| @@ 351-358 (lines=8) @@ | ||
| 348 | ||
| 349 | // can't use helper function with type_subtype_pair because |
|
| 350 | // it's already an array...just need to merge it |
|
| 351 | if (isset($options['type_subtype_pair'])) { |
|
| 352 | if (isset($options['type_subtype_pairs'])) { |
|
| 353 | $options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'], |
|
| 354 | $options['type_subtype_pair']); |
|
| 355 | } else { |
|
| 356 | $options['type_subtype_pairs'] = $options['type_subtype_pair']; |
|
| 357 | } |
|
| 358 | } |
|
| 359 | ||
| 360 | $singulars = array('type', 'subtype', 'guid', 'owner_guid', 'container_guid', 'site_guid'); |
|
| 361 | $options = _elgg_normalize_plural_options_array($options, $singulars); |
|
| @@ 149-156 (lines=8) @@ | ||
| 146 | ||
| 147 | // can't use helper function with type_subtype_pair because |
|
| 148 | // it's already an array...just need to merge it |
|
| 149 | if (isset($options['type_subtype_pair'])) { |
|
| 150 | if (isset($options['type_subtype_pairs'])) { |
|
| 151 | $options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'], |
|
| 152 | $options['type_subtype_pair']); |
|
| 153 | } else { |
|
| 154 | $options['type_subtype_pairs'] = $options['type_subtype_pair']; |
|
| 155 | } |
|
| 156 | } |
|
| 157 | ||
| 158 | $singulars = array( |
|
| 159 | 'type', 'subtype', 'type_subtype_pair', |
|
| @@ 1273-1279 (lines=7) @@ | ||
| 1270 | ||
| 1271 | // can't use helper function with type_subtype_pair because |
|
| 1272 | // it's already an array...just need to merge it |
|
| 1273 | if (isset($options['type_subtype_pair'])) { |
|
| 1274 | if (isset($options['type_subtype_pairs'])) { |
|
| 1275 | $options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'], $options['type_subtype_pair']); |
|
| 1276 | } else { |
|
| 1277 | $options['type_subtype_pairs'] = $options['type_subtype_pair']; |
|
| 1278 | } |
|
| 1279 | } |
|
| 1280 | ||
| 1281 | $singulars = array('type', 'subtype', 'guid', 'owner_guid', 'container_guid', 'site_guid'); |
|
| 1282 | $options = elgg_normalise_plural_options_array($options, $singulars); |
|
| @@ 1425-1431 (lines=7) @@ | ||
| 1422 | ||
| 1423 | // can't use helper function with type_subtype_pair because |
|
| 1424 | // it's already an array...just need to merge it |
|
| 1425 | if (isset($options['type_subtype_pair'])) { |
|
| 1426 | if (isset($options['type_subtype_pairs'])) { |
|
| 1427 | $options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'], $options['type_subtype_pair']); |
|
| 1428 | } else { |
|
| 1429 | $options['type_subtype_pairs'] = $options['type_subtype_pair']; |
|
| 1430 | } |
|
| 1431 | } |
|
| 1432 | ||
| 1433 | $singulars = array('type', 'subtype', 'guid', 'owner_guid', 'container_guid', 'site_guid'); |
|
| 1434 | $options = _elgg_normalize_plural_options_array($options, $singulars); |
|
