Merge pull request #345 from adam-vessey/7.x-fix-and-add-deprecated-message

Fix the existing deprecation message, and add one for the extra DS-COMPOSITE-MODEL parser.

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) {
   module_load_include('inc', 'islandora', 'includes/utilities');
   if (empty($configuration['object'])) {
-    $message = islandora_deprecated('Please use "objects" as the default ingest form configuration property.');
-    trigger_error(check_plain($message), E_USER_DEPRECATED);
+    $message = islandora_deprecated('7.x-1.2', t('Please use "objects" as the default ingest form configuration property.'));
+    trigger_error(filter_xss($message), E_USER_DEPRECATED);
     // ID is more specific than namespace so it will take precedence.
     $id = isset($configuration['namespace']) ? $configuration['namespace'] : 'islandora';
     $id = isset($configuration['id']) ? $configuration['id'] : $id;

includes/utilities.inc

@@ -636,6 +636,9 @@ function islandora_system_settings_form_default_value($name, $default_value, arr
  *       is optional.
  */
 function islandora_get_comp_ds_mappings($pid) {
+  $message = islandora_deprecated('7.x-1.2', t('Refactor to use the more flexible islandora_get_datastreams_requirements_from_content_model().'));
+  trigger_error(filter_xss($message), E_USER_DEPRECATED);
+
   $cm_object = islandora_object_load($pid);
   if (!isset($cm_object) || !isset($cm_object['DS-COMPOSITE-MODEL'])) {
     return FALSE;
@@ -825,7 +828,7 @@ function islandora_content_model_select_table_form_element($drupal_variable, $de
  *
  * @code
  *   $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
  *
  * @param string $release