From 147978b6cf1724a270018057b2648d35bd624ef8 Mon Sep 17 00:00:00 2001 From: nruest Date: Fri, 5 Sep 2014 12:24:44 -0400 Subject: [PATCH] ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! --- includes/utilities.inc | 106 ----------------------------------------- islandora_solr.module | 6 --- 2 files changed, 112 deletions(-) diff --git a/includes/utilities.inc b/includes/utilities.inc index 678f3e6c..bc814c9b 100644 --- a/includes/utilities.inc +++ b/includes/utilities.inc @@ -316,109 +316,3 @@ function islandora_solr_prepare_solr_results($solr_results) { } return $solr_results; } - -/** - * @defgroup islandora_solr_deprecated Deprecated function signatures. - * @{ - * A number of function signatures which are not prefixed with our module name. - * - * Supporting them with a warning for now, just in case. - */ - -// @codingStandardsIgnoreStart - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_build_substitution_list(). - * @see islandora_solr_build_substitution_list() - */ -function islandora_build_substitution_list($value) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_build_substitution_list().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_build_substitution_list($value); -} - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_escape(). - * @see islandora_solr_escape() - */ -function solr_escape($facets) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_escape().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_escape($facets); -} - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_lesser_escape(). - * @see islandora_solr_lesser_escape() - */ -function lesser_escape($value) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_lesser_escape().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_lesser_escape($value); -} - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_csv_explode(). - * @see islandora_solr_csv_explode() - */ -function csv_explode($value) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_csv_explode().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_csv_explode($value); -} - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_restore_slashes(). - * @see islandora_solr_restore_slashes() - */ -function restore_slashes($value) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_restore_slashes().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_restore_slashes($value); -} - -/** - * Old function signature. - * - * @deprecated - * Use islandora_solr_replace_slashes(). - * @see islandora_solr_replace_slashes() - */ -function replace_slashes($value) { - module_load_include('inc', 'islandora', 'includes/utilities'); - $message = islandora_deprecated('7.x-1.2', t('Refactor to use islandora_solr_replace_slashes().')); - trigger_error(filter_xss($message), E_USER_DEPRECATED); - - return islandora_solr_replace_slashes($value); -} - -// @codingStandardsIgnoreEnd - -/** - * @} End of "defgroup islandora_solr_deprecated". - */ diff --git a/islandora_solr.module b/islandora_solr.module index f565a530..fa730db7 100644 --- a/islandora_solr.module +++ b/islandora_solr.module @@ -8,12 +8,6 @@ define('ISLANDORA_SOLR_SEARCH_PATH', 'islandora/search'); define('ISLANDORA_SOLR_QUERY_SPLIT_REGEX', '/(?