diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/entities.php | 4 | ||||
| -rw-r--r-- | engine/lib/group.php | 7 | ||||
| -rw-r--r-- | engine/lib/objects.php | 7 | ||||
| -rw-r--r-- | engine/lib/sites.php | 2 | ||||
| -rw-r--r-- | engine/lib/users.php | 7 |
5 files changed, 21 insertions, 6 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 59dc65658..2519400d6 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -3576,8 +3576,6 @@ function entities_init() { register_plugin_hook('permissions_check:metadata','all','recursive_delete_permissions_check'); register_plugin_hook('gc','system','entities_gc'); - - register_plugin_hook('search','all','search_list_entities_by_name'); } /** Register the import hook */ @@ -3593,4 +3591,4 @@ register_plugin_hook('volatile', 'metadata', 'volatile_data_export_plugin_hook') register_plugin_hook('entity:icon:url', 'all', 'default_entity_icon_hook', 1000); /** Register init system event **/ -register_elgg_event_handler('init','system','entities_init');
\ No newline at end of file +register_elgg_event_handler('init','system','entities_init'); diff --git a/engine/lib/group.php b/engine/lib/group.php index cbc34b71b..3a6f3adf1 100644 --- a/engine/lib/group.php +++ b/engine/lib/group.php @@ -867,8 +867,10 @@ function add_group_tool_option($name,$label,$default_on=true) { * @param int $offset Offset. * @param string $order_by The order. * @param boolean $count Whether to return the count of results or just the results. + * @deprecated 1.7 */ function search_for_group($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) { + elgg_log('search_for_group() was deprecated in 1.7.', 'WARNING'); global $CONFIG; $criteria = sanitise_string($criteria); @@ -905,9 +907,10 @@ function search_for_group($criteria, $limit = 10, $offset = 0, $order_by = "", $ /** * Returns a formatted list of groups suitable for injecting into search. - * + * @deprecated 1.7 */ function search_list_groups_by_name($hook, $user, $returnvalue, $tag) { + elgg_log('search_list_groups_by_name() was deprecated in 1.7.', 'WARNING'); // Change this to set the number of groups that display on the search page $threshold = 4; @@ -935,8 +938,10 @@ function search_list_groups_by_name($hook, $user, $returnvalue, $tag) { * @param string $tag Search criteria * @param int $limit The number of entities to display on a page * @return string The list in a form suitable to display + * @deprecated 1.7 */ function list_group_search($tag, $limit = 10) { + elgg_log('list_group_search() was deprecated in 1.7.', 'WARNING'); $offset = (int) get_input('offset'); $limit = (int) $limit; $count = (int) search_for_group($tag, 10, 0, '', true); diff --git a/engine/lib/objects.php b/engine/lib/objects.php index f2faf0d10..8f49ea1fa 100644 --- a/engine/lib/objects.php +++ b/engine/lib/objects.php @@ -293,8 +293,10 @@ function delete_object_entity($guid) { * @param int $offset Offset. * @param string $order_by The order. * @param boolean $count Whether to return the count of results or just the results. + * @deprecated 1.7 */ function search_for_object($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) { + elgg_log('search_for_object was deprecated in 1.7.', 'WARNING'); global $CONFIG; $criteria = sanitise_string($criteria); @@ -355,9 +357,12 @@ function objects_test($hook, $type, $value, $params) { /** * Returns a formatted list of objects suitable for injecting into search. + * @deprecated 1.7 * */ function search_list_objects_by_name($hook, $user, $returnvalue, $tag) { + elgg_log('search_list_objects_by_name was deprecated in 1.7.', 'WARNING'); + // Change this to set the number of users that display on the search page $threshold = 4; @@ -379,4 +384,4 @@ function search_list_objects_by_name($hook, $user, $returnvalue, $tag) { } register_elgg_event_handler('init', 'system', 'objects_init', 0); -register_plugin_hook('unit_test', 'system', 'objects_test');
\ No newline at end of file +register_plugin_hook('unit_test', 'system', 'objects_test'); diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 0892f2963..c69032bd2 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -501,8 +501,10 @@ function get_site_by_url($url) { * @param int $offset Offset. * @param string $order_by The order. * @param boolean $count Whether to return the count of results or just the results. + * @deprecated 1.7 */ function search_for_site($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) { + elgg_log('search_for_site() was deprecated in 1.7.', 'WARNING'); global $CONFIG; $criteria = sanitise_string($criteria); diff --git a/engine/lib/users.php b/engine/lib/users.php index 341024a45..5e5486133 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -869,8 +869,10 @@ function get_user_by_email($email) { * @param int $offset Offset. * @param string $order_by The order. * @param boolean $count Whether to return the count of results or just the results. + * @deprecated 1.7 */ function search_for_user($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) { + elgg_log('search_for_user() was deprecated in 1.7.', 'WARNING'); global $CONFIG; $criteria = sanitise_string($criteria); @@ -913,8 +915,10 @@ function search_for_user($criteria, $limit = 10, $offset = 0, $order_by = "", $c * @param string $tag Search criteria * @param int $limit The number of entities to display on a page * @return string The list in a form suitable to display + * @deprecated 1.7 */ function list_user_search($tag, $limit = 10) { + elgg_log('list_user_search() deprecated in 1.7', 'WARNING'); $offset = (int) get_input('offset'); $limit = (int) $limit; $count = (int) search_for_user($tag, 10, 0, '', true); @@ -1540,9 +1544,10 @@ function users_init() { /** * Returns a formatted list of users suitable for injecting into search. - * + * @deprecated 1.7 */ function search_list_users_by_name($hook, $user, $returnvalue, $tag) { + elgg_log('search_list_users_by_name() was deprecated in 1.7', 'WARNING'); // Change this to set the number of users that display on the search page $threshold = 4; |