Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! #190

Merged
merged 1 commit into from
Sep 25, 2014
Merged

ISLANDORA-1042 -- DESTROY ALL DEPRECATED CODE! #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions includes/utilities.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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".
*/
6 changes: 0 additions & 6 deletions islandora_solr.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
define('ISLANDORA_SOLR_SEARCH_PATH', 'islandora/search');
define('ISLANDORA_SOLR_QUERY_SPLIT_REGEX', '/(?<!\\\\) /');
define('ISLANDORA_SOLR_QUERY_FIELD_VALUE_SPLIT_REGEX', '/(?<!\\\\):/');
// @codingStandardsIgnoreStart
/**
* @deprecated
*/
define('SOLR_SEARCH_PATH', ISLANDORA_SOLR_SEARCH_PATH);
// @codingStandardsIgnoreEnd

// Includes functions for common db queries.
require_once dirname(__FILE__) . '/includes/db.inc';
Expand Down