Index: node_expire/node_expire.nodeapi.inc =================================================================== RCS file: /viewvc/drupal/contributions/modules/node_expire/node_expire.nodeapi.inc,v retrieving revision 1.4 diff -u -p -r1.4 node_expire.nodeapi.inc --- node_expire.nodeapi.inc 2009-01-30 19:26:53.000000000 -0600 1.4 +++ node_expire.nodeapi.inc 2010-06-25 11:05:16.000000000 -0500 @@ -29,22 +29,24 @@ function _node_expire_nodeapi(&$ntypes, break; case 'validate': - // The only restriction we have is that the node can't expire in the past. - if ($node->expire == '') { - if (!empty($ntypes['required'])) { - form_set_error('expire_date', t('You must choose an expiration date.')); - } - } - elseif (!$expire = strtotime($node->expire) or $expire <= 0) { - form_set_error('expire_date', t('You have to specify a valid date.')); - } - elseif ($expire <= time()) { - form_set_error('expire_date', t("You can't expire a node in the past!")); - } - elseif (!empty($ntypes['max']) and $expire > strtotime($ntypes['max'], $node->created)) { - form_set_error('expire_date', t('It must expire before %date.', - array('%date' => format_date(strtotime($ntypes['max'], $node->created), 'custom', NODE_EXPIRE_FORMAT)))); - } + if (user_access('edit node expire') or user_access('administer node expire')) { + // The only restriction we have is that the node can't expire in the past. + if ($node->expire == '') { + if (!empty($ntypes['required'])) { + form_set_error('expire_date', t('You must choose an expiration date.')); + } + } + elseif (!$expire = strtotime($node->expire) or $expire <= 0) { + form_set_error('expire_date', t('You have to specify a valid date.')); + } + elseif ($expire <= time()) { + form_set_error('expire_date', t("You can't expire a node in the past!")); + } + elseif (!empty($ntypes['max']) and $expire > strtotime($ntypes['max'], $node->created)) { + form_set_error('expire_date', t('It must expire before %date.', + array('%date' => format_date(strtotime($ntypes['max'], $node->created), 'custom', NODE_EXPIRE_FORMAT)))); + } + } break; case 'update':