Browse Source

Fix the deprecation message.

pull/345/head
Adam Vessey 12 years ago
parent
commit
73cfd46c68
  1. 4
      includes/ingest.form.inc
  2. 2
      includes/utilities.inc

4
includes/ingest.form.inc

@ -142,8 +142,8 @@ function islandora_ingest_form_get_last_step_id(array &$form_state) {
function islandora_ingest_form_prepare_new_object(array $configuration) { function islandora_ingest_form_prepare_new_object(array $configuration) {
module_load_include('inc', 'islandora', 'includes/utilities'); module_load_include('inc', 'islandora', 'includes/utilities');
if (empty($configuration['object'])) { if (empty($configuration['object'])) {
$message = islandora_deprecated('Please use "objects" as the default ingest form configuration property.'); $message = islandora_deprecated('7.x-1.2', t('Please use "objects" as the default ingest form configuration property.'));
trigger_error(check_plain($message), E_USER_DEPRECATED); trigger_error(filter_xss($message), E_USER_DEPRECATED);
// ID is more specific than namespace so it will take precedence. // ID is more specific than namespace so it will take precedence.
$id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora'; $id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora';
$id = isset($configuration['id']) ? $configuration['id'] : $id; $id = isset($configuration['id']) ? $configuration['id'] : $id;

2
includes/utilities.inc

@ -825,7 +825,7 @@ function islandora_content_model_select_table_form_element($drupal_variable, $de
* *
* @code * @code
* $message = islandora_deprecated('7.x-1.1', t('Use more cowbell.')) * $message = islandora_deprecated('7.x-1.1', t('Use more cowbell.'))
* trigger_error(check_plain($message), E_USER_DEPRECATED) * trigger_error(filter_xss($message), E_USER_DEPRECATED)
* @endcode * @endcode
* *
* @param string $release * @param string $release

Loading…
Cancel
Save