diff --git a/ed_classified.module b/ed_classified.module old mode 100644 new mode 100755 index 4a1bbdb..c661e8a --- a/ed_classified.module +++ b/ed_classified.module @@ -639,7 +639,7 @@ function _ed_classified_form_submit($form, &$form_state) { // If new ad, or user wants to reset expiration, or taxonomy was changed... recalc expiration? if (empty($node->expires_on) || $user_reset) { // it's a new ad, or the user chose to reset the expiration - $form_state['values']['expires_on'] = $expiration; // _ed_classified_get_default_ad_duration_in_seconds(); + $form_state['values']['expires_on'] = $expiration; // _edi_wd(sprintf('Ad expiration was %d (%s), now %d (%s)', $old_expires, _edi_safe_date_fmt($old_expires), $node->expires_on, _edi_safe_date_fmt($node->expires_on))); // we deal with republishing further down $expiration_changed = TRUE; diff --git a/ed_classified_utils.inc b/ed_classified_utils.inc old mode 100644 new mode 100755 index a9749c5..ce77a3a --- a/ed_classified_utils.inc +++ b/ed_classified_utils.inc @@ -108,15 +108,6 @@ function _ed_tid_is_classified_term($tid) { } /** - * Get default ad duration in seconds - */ - -function _ed_classified_get_default_ad_duration_in_seconds() { - $duration = _ed_classified_days_to_seconds(_ed_classified_variable_get('default_ad_duration', EDI_CLASSIFIED_VAR_DEF_EXPIRATION_DAYS)); - return $duration; -} - -/** * Find the longest duration, in days, for a given set of terms * @param $terms, an array of vid/tid pairs with vid as the key * sub-arrays are allowed, for example: @@ -155,7 +146,7 @@ function _ed_classified_get_longest_duration($terms) { } // If we couldn't find a duration then set to default rather than zero if (0 == $duration) { - $duration = _ed_classified_get_default_ad_duration_in_seconds(); + $duration = _ed_classified_variable_get('default_ad_duration', EDI_CLASSIFIED_VAR_DEF_EXPIRATION_DAYS); } return $duration; }