commit 0f82073882ee9491a52395de5b4a80b859f0e79e Author: Damien Tournoud Date: Thu Aug 13 23:10:33 2009 +0200 Switch from '_' to '__' for the hook separator. diff --git a/includes/common.inc b/includes/common.inc index 4f1368e..55333f5 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3792,7 +3792,7 @@ function drupal_alter($type, &$data) { $args = array_merge($args, $additional_args); foreach (module_implements($type . '_alter') as $module) { - $function = $module . '_' . $type . '_alter'; + $function = $module . '__' . $type . '_alter'; call_user_func_array($function, $args); } } diff --git a/includes/file.inc b/includes/file.inc index fc568a8..1ec96cd 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -513,7 +513,7 @@ function file_load_multiple($fids = array(), $conditions = array()) { // and add them to the static cache. if (!empty($files)) { foreach (module_implements('file_load') as $module) { - $function = $module . '_file_load'; + $function = $module . '__file_load'; $function($files); } } diff --git a/includes/image.inc b/includes/image.inc index 4309ac9..7570e3b 100644 --- a/includes/image.inc +++ b/includes/image.inc @@ -65,7 +65,7 @@ function image_get_toolkit() { if (!isset($toolkit)) { $toolkits = image_get_available_toolkits(); $toolkit = variable_get('image_toolkit', 'gd'); - if (!isset($toolkits[$toolkit]) || !drupal_function_exists('image_' . $toolkit . '_load')) { + if (!isset($toolkits[$toolkit]) || !drupal_function_exists('image_' . $toolkit . '__load')) { // The selected toolkit isn't available so return the first one found. If // none are available this will return FALSE. reset($toolkits); @@ -89,7 +89,7 @@ function image_get_toolkit() { * Mixed values (typically Boolean indicating successful operation). */ function image_toolkit_invoke($method, stdClass $image, array $params = array()) { - $function = 'image_' . $image->toolkit . '_' . $method; + $function = 'image_' . $image->toolkit . '__' . $method; if (drupal_function_exists($function)) { array_unshift($params, $image); return call_user_func_array($function, $params); diff --git a/includes/install.inc b/includes/install.inc index fff03e8..995c6fc 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -95,8 +95,8 @@ function drupal_get_schema_versions($module) { $updates = array(); $functions = get_defined_functions(); foreach ($functions['user'] as $function) { - if (strpos($function, $module . '_update_') === 0) { - $version = substr($function, strlen($module . '_update_')); + if (strpos($function, $module . '__update_') === 0) { + $version = substr($function, strlen($module . '__update_')); if (is_numeric($version)) { $updates[] = $version; } @@ -171,7 +171,7 @@ function drupal_install_profile_name() { if (!isset($name)) { // Load profile details. - $function = $profile . '_profile_details'; + $function = $profile . '__profile_details'; if (function_exists($function)) { $details = $function(); } @@ -987,7 +987,7 @@ function drupal_check_profile($profile) { $requirements = array(); foreach ($installs as $install) { require_once DRUPAL_ROOT . '/' . $install->filepath; - $function = $install->name . '_requirements'; + $function = $install->name . '__requirements'; if (function_exists($function)) { $requirements = array_merge($requirements, $function('install')); } diff --git a/includes/mail.inc b/includes/mail.inc index 33e8436..102a777 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -115,7 +115,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N // Build the e-mail (get subject and body, allow additional headers) by // invoking hook_mail() on this module. We cannot use module_invoke() as // we need to have $message by reference in hook_mail(). - if (drupal_function_exists($function = $module . '_mail')) { + if (drupal_function_exists($function = $module . '__mail')) { $function($key, $message, $params); } diff --git a/includes/menu.inc b/includes/menu.inc index a9917dc..2d7959e 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1328,7 +1328,7 @@ function menu_get_active_help() { $empty_arg = drupal_help_arg(); foreach (module_implements('help') as $module) { - $function = $module . '_help'; + $function = $module . '__help'; // Lookup help for this path. if ($help = $function($router_path, $arg)) { $output .= $help . "\n"; @@ -1857,7 +1857,7 @@ function menu_router_build() { // a given item came from. $callbacks = array(); foreach (module_implements('menu') as $module) { - $router_items = call_user_func($module . '_menu'); + $router_items = call_user_func($module . '__menu'); if (isset($router_items) && is_array($router_items)) { foreach (array_keys($router_items) as $path) { $router_items[$path]['module'] = $module; diff --git a/includes/module.inc b/includes/module.inc index 83a421d..d186a3a 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -324,7 +324,7 @@ function module_disable($module_list) { * implemented in that module. */ function module_hook($module, $hook) { - $function = $module . '_' . $hook; + $function = $module . '__' . $hook; return function_exists($function) || drupal_function_exists($function); } @@ -388,7 +388,7 @@ function module_implements($hook, $sort = FALSE) { $implementations[$hook] = db_query("SELECT module FROM {registry} WHERE type = 'function' AND suffix = :hook ORDER BY weight, module", array(':hook' => $hook))->fetchCol(); } foreach ($implementations[$hook] as $module) { - $function = $module . '_' . $hook; + $function = $module . '__' . $hook; if (!function_exists($function)) { drupal_function_exists($function); } @@ -428,7 +428,7 @@ function module_implements($hook, $sort = FALSE) { function _module_implements_maintenance($hook, $sort = FALSE) { $implementations = array(); foreach (module_list() as $module) { - $function = $module . '_' . $hook; + $function = $module . '__' . $hook; if (function_exists($function)) { $implementations[] = $module; } @@ -457,7 +457,7 @@ function module_invoke() { $hook = $args[1]; unset($args[0], $args[1]); if (module_hook($module, $hook)) { - return call_user_func_array($module . '_' . $hook, $args); + return call_user_func_array($module . '__' . $hook, $args); } } /** @@ -477,7 +477,7 @@ function module_invoke_all() { unset($args[0]); $return = array(); foreach (module_implements($hook) as $module) { - $function = $module . '_' . $hook; + $function = $module . '__' . $hook; if (drupal_function_exists($function)) { $result = call_user_func_array($function, $args); if (isset($result) && is_array($result)) { diff --git a/includes/registry.inc b/includes/registry.inc index 7243ff2..7946dc3 100644 --- a/includes/registry.inc +++ b/includes/registry.inc @@ -180,7 +180,7 @@ function _registry_parse_file($filename, $contents, $module = '', $weight = 0) { if ($type == 'function' && !empty($module)) { $n = strlen($module); if (substr($resource_name, 0, $n) == $module) { - $suffix = substr($resource_name, $n + 1); + $suffix = substr($resource_name, $n + 2); } } $fields = array( diff --git a/includes/theme.inc b/includes/theme.inc index 6cb7ab0..6739687 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -311,7 +311,7 @@ function drupal_theme_rebuild() { */ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { $result = array(); - $function = $name . '_theme'; + $function = $name . '__theme'; // Template functions work in two distinct phases with the process // functions always being executed after the preprocess functions. diff --git a/includes/update.inc b/includes/update.inc index c72e085..acbe4a9 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -308,7 +308,7 @@ function update_do_one($module, $number, &$context) { return; } - $function = $module . '_update_' . $number; + $function = $module . '__update_' . $number; if (function_exists($function)) { $ret = $function($context['sandbox']); } diff --git a/install.php b/install.php index 4d7f98d..092b350 100644 --- a/install.php +++ b/install.php @@ -562,7 +562,7 @@ function install_tasks($install_state) { // Now add any tasks defined by the installation profile. if (!empty($install_state['parameters']['profile'])) { - $function = $install_state['parameters']['profile'] . '_profile_tasks'; + $function = $install_state['parameters']['profile'] . '__profile_tasks'; if (function_exists($function)) { $result = $function($install_state); if (is_array($result)) { @@ -1152,7 +1152,7 @@ function install_select_locale(&$install_state) { } else { // Allow profile to pre-select the language, skipping the selection. - $function = $profilename . '_profile_details'; + $function = $profilename . '__profile_details'; if (function_exists($function)) { $details = $function(); if (isset($details['language'])) { @@ -1620,7 +1620,7 @@ function _install_configure_form(&$form_state, &$install_state) { // Allow the profile to alter this form. $form_state isn't available // here, but to conform to the hook_form_alter() signature, we pass // an empty array. - $hook_form_alter = $install_state['parameters']['profile'] . '_form_alter'; + $hook_form_alter = $install_state['parameters']['profile'] . '__form_alter'; if (function_exists($hook_form_alter)) { $hook_form_alter($form, array(), 'install_configure'); } diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 755c56d..a7efc4c 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -324,7 +324,7 @@ function _field_invoke_multiple($op, $obj_type, $objects, &$a = NULL, &$b = NULL // For each field, invoke the field hook and collect results. foreach ($fields as $field_id => $field) { $field_name = $field['field_name']; - $function = $options['default'] ? 'field_default_' . $op : $field['module'] . '_field_' . $op; + $function = $options['default'] ? 'field_default_' . $op : $field['module'] . '__field_' . $op; if (drupal_function_exists($function)) { $results = $function($obj_type, $grouped_objects[$field_id], $field, $grouped_instances[$field_id], $grouped_items[$field_id], $options, $a, $b); if (isset($results)) { @@ -459,7 +459,7 @@ function field_attach_form($obj_type, $object, &$form, &$form_state) { // Let other modules make changes to the form. foreach (module_implements('field_attach_form') as $module) { - $function = $module . '_field_attach_form'; + $function = $module . '__field_attach_form'; $function($obj_type, $object, $form, $form_state); } } @@ -549,7 +549,7 @@ function field_attach_load($obj_type, $objects, $age = FIELD_LOAD_CURRENT, $opti // data before the storage engine, accumulating along the way. $skip_fields = array(); foreach (module_implements('field_attach_pre_load') as $module) { - $function = $module . '_field_attach_pre_load'; + $function = $module . '__field_attach_pre_load'; $function($obj_type, $queried_objects, $age, $skip_fields, $options); } @@ -563,7 +563,7 @@ function field_attach_load($obj_type, $objects, $age = FIELD_LOAD_CURRENT, $opti // Invoke hook_field_attach_load(): let other modules act on loading the // object. foreach (module_implements('field_attach_load') as $module) { - $function = $module . '_field_attach_load'; + $function = $module . '__field_attach_load'; $function($obj_type, $queried_objects, $age, $options); } @@ -631,7 +631,7 @@ function field_attach_validate($obj_type, $object) { // Let other modules validate the object. foreach (module_implements('field_attach_validate') as $module) { - $function = $module . '_field_attach_validate'; + $function = $module . '__field_attach_validate'; $function($obj_type, $object, $errors); } @@ -708,7 +708,7 @@ function field_attach_submit($obj_type, $object, $form, &$form_state) { // Let other modules act on submitting the object. foreach (module_implements('field_attach_submit') as $module) { - $function = $module . '_field_attach_submit'; + $function = $module . '__field_attach_submit'; $function($obj_type, $object, $form, $form_state); } } @@ -729,7 +729,7 @@ function field_attach_presave($obj_type, $object) { // Let other modules act on presaving the object. foreach (module_implements('field_attach_presave') as $module) { - $function = $module . '_field_attach_presave'; + $function = $module . '__field_attach_presave'; $function($obj_type, $object); } } @@ -758,7 +758,7 @@ function field_attach_insert($obj_type, $object) { // fields along the way. $skip_fields = array(); foreach (module_implements('field_attach_pre_insert') as $module) { - $function = $module . '_field_attach_pre_insert'; + $function = $module . '__field_attach_pre_insert'; $function($obj_type, $object, $skip_fields); } @@ -786,7 +786,7 @@ function field_attach_update($obj_type, $object) { // fields along the way. $skip_fields = array(); foreach (module_implements('field_attach_pre_update') as $module) { - $function = $module . '_field_attach_pre_update'; + $function = $module . '__field_attach_pre_update'; $function($obj_type, $object, $skip_fields); } @@ -814,7 +814,7 @@ function field_attach_delete($obj_type, $object) { // Let other modules act on deleting the object. foreach (module_implements('field_attach_delete') as $module) { - $function = $module . '_field_attach_delete'; + $function = $module . '__field_attach_delete'; $function($obj_type, $object); } @@ -839,7 +839,7 @@ function field_attach_delete_revision($obj_type, $object) { // Let other modules act on deleting the revision. foreach (module_implements('field_attach_delete_revision') as $module) { - $function = $module . '_field_attach_delete_revision'; + $function = $module . '__field_attach_delete_revision'; $function($obj_type, $object); } } @@ -931,7 +931,7 @@ function field_attach_query($field_id, $conditions, $count, &$cursor = NULL, $ag // handle the query. $skip_field = FALSE; foreach (module_implements('field_attach_pre_query') as $module) { - $function = $module . '_field_attach_pre_query'; + $function = $module . '__field_attach_pre_query'; $results = $function($field_id, $conditions, $count, $cursor, $age, $skip_field); // Stop as soon as a module claims it handled the query. if ($skip_field) { @@ -940,7 +940,7 @@ function field_attach_query($field_id, $conditions, $count, &$cursor = NULL, $ag } // If the request hasn't been handled, let the storage engine handle it. if (!$skip_field) { - $function = variable_get('field_storage_module', 'field_sql_storage') . '_field_storage_query'; + $function = variable_get('field_storage_module', 'field_sql_storage') . '__field_storage_query'; $results = $function($field_id, $conditions, $count, $cursor, $age); } @@ -1086,7 +1086,7 @@ function field_attach_create_bundle($bundle) { field_cache_clear(); foreach (module_implements('field_attach_create_bundle') as $module) { - $function = $module . '_field_attach_create_bundle'; + $function = $module . '__field_attach_create_bundle'; $function($bundle); } } @@ -1110,7 +1110,7 @@ function field_attach_rename_bundle($bundle_old, $bundle_new) { field_cache_clear(); foreach (module_implements('field_attach_rename_bundle') as $module) { - $function = $module . '_field_attach_rename_bundle'; + $function = $module . '__field_attach_rename_bundle'; $function($bundle_old, $bundle_new); } } @@ -1137,7 +1137,7 @@ function field_attach_delete_bundle($bundle) { // Let other modules act on deleting the bundle. foreach (module_implements('field_attach_delete_bundle') as $module) { - $function = $module . '_field_attach_delete_bundle'; + $function = $module . '__field_attach_delete_bundle'; $function($bundle, $instances); } } diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc index 91f5748..7bd0845 100644 --- a/modules/field/field.crud.inc +++ b/modules/field/field.crud.inc @@ -844,7 +844,7 @@ function field_purge_data($obj_type, $object, $field, $instance) { // Let other modules act on purging the data. foreach (module_implements('field_attach_purge') as $module) { - $function = $module . '_field_attach_purge'; + $function = $module . '__field_attach_purge'; $function($obj_type, $object, $field, $instance); } } diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index f8e77e9..97a5f18 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -59,7 +59,7 @@ function field_default_form($obj_type, $object, $field, $instance, $items, &$for // element and make it the $delta value. else { $delta = isset($get_delta) ? $get_delta : 0; - $function = $instance['widget']['module'] . '_field_widget'; + $function = $instance['widget']['module'] . '__field_widget'; if (drupal_function_exists($function)) { if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { $defaults = array( @@ -145,7 +145,7 @@ function field_multiple_value_form($field, $instance, $items, &$form, &$form_sta '#suffix' => '', ); - $function = $instance['widget']['module'] . '_field_widget'; + $function = $instance['widget']['module'] . '__field_widget'; if (drupal_function_exists($function)) { for ($delta = 0; $delta <= $max; $delta++) { if ($element = $function($form, $form_state, $field, $instance, $items, $delta)) { @@ -283,7 +283,7 @@ function theme_field_multiple_value_form($element) { function field_default_form_errors($obj_type, $object, $field, $instance, $items, $form, $errors) { $field_name = $field['field_name']; if (!empty($errors[$field_name])) { - $function = $instance['widget']['module'] . '_field_widget_error'; + $function = $instance['widget']['module'] . '__field_widget_error'; $function_exists = drupal_function_exists($function); // Walk the form down to where the widget lives. diff --git a/modules/field/field.module b/modules/field/field.module index 0deb6d2..cb64dc8 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -281,7 +281,7 @@ function field_associate_fields($module) { function field_set_empty($field, $items) { // Filter out empty values. $filtered = array(); - $function = $field['module'] . '_field_is_empty'; + $function = $field['module'] . '___field_is_empty'; foreach ((array) $items as $delta => $item) { if (!$function($item, $field)) { $filtered[] = $item; @@ -434,7 +434,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL, $display['settings'] += field_info_formatter_settings($display['type']); if ($display['type'] !== 'hidden') { - $theme = $formatter['module'] . '_formatter_' . $display['type']; + $theme = $formatter['module'] . '__formatter_' . $display['type']; $element = array( '#theme' => $theme, @@ -452,7 +452,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL, // hook_field('sanitize') expects an array of items, so we build one. $items = array($item); - $function = $field['module'] . '_field_sanitize'; + $function = $field['module'] . '__field_sanitize'; if (function_exists($function)) { $function($obj_type, $object, $field, $instance, $items); } @@ -462,7 +462,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL, else { // Multiple values formatter. $items = $item; - $function = $field['module'] . '_field_sanitize'; + $function = $field['module'] . '__field_sanitize'; if (function_exists($function)) { $function($obj_type, $object, $field, $instance, $items); } @@ -509,7 +509,7 @@ function field_view_field($obj_type, $object, $field, $instance, $build_mode = ' $items = $object->$field['field_name']; // One-field equivalent to _field_invoke('sanitize'). - $function = $field['module'] . '_field_sanitize'; + $function = $field['module'] . '__field_sanitize'; if (drupal_function_exists($function)) { $function($obj_type, $object, $field, $instance, $items); $object->$field['field_name'] = $items; diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module index 3fc492a..8ca7ace 100644 --- a/modules/field/modules/options/options.module +++ b/modules/field/modules/options/options.module @@ -371,7 +371,7 @@ function options_transpose_array_rows_cols($array) { * Otherwise, try list_allowed_values() for an options list. */ function options_options($field, $instance) { - $function = $field['module'] . '_allowed_values'; + $function = $field['module'] . '__allowed_values'; $options = function_exists($function) ? $function($field) : (array) list_allowed_values($field); // Add an empty choice for : // - non required radios diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 1b3c5bc..5e760ac 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -330,7 +330,7 @@ function filter_list_all() { $filters = array(); foreach (module_implements('filter') as $module) { - $function = $module . '_filter'; + $function = $module . '__filter'; $list = $function('list'); if (isset($list) && is_array($list)) { foreach ($list as $delta => $name) { diff --git a/modules/help/help.test b/modules/help/help.test index 1f5fdfe..de2a623 100644 --- a/modules/help/help.test +++ b/modules/help/help.test @@ -54,7 +54,7 @@ class HelpTestCase extends DrupalWebTestCase { // View module help node. $this->drupalGet('admin/help/' . $module); $this->assertResponse($response); - if (drupal_function_exists($module . '_help')) { + if (drupal_function_exists($module . '__help')) { // View module help node. $this->drupalGet('admin/help/' . $module); $this->assertResponse($response); diff --git a/modules/node/node.module b/modules/node/node.module index 7c19f69..73bc512 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -667,7 +667,7 @@ function node_hook($node, $hook) { function node_invoke($node, $hook, $a2 = NULL, $a3 = NULL, $a4 = NULL) { if (node_hook($node, $hook)) { $base = node_type_get_base($node); - $function = $base . '_' . $hook; + $function = $base . '__' . $hook; return ($function($node, $a2, $a3, $a4)); } } @@ -790,7 +790,7 @@ function node_load_multiple($nids = array(), $conditions = array(), $reset = FAL // Call node type specific callbacks on each typed array of nodes. foreach ($typed_nodes as $type => $nodes_of_type) { if (node_hook($type, 'load')) { - $function = node_type_get_base($type) . '_load'; + $function = node_type_get_base($type) . '__load'; $function($nodes_of_type); } } @@ -806,7 +806,7 @@ function node_load_multiple($nids = array(), $conditions = array(), $reset = FAL // Call hook_node_load(), pass the node types so modules can return early // if not acting on types in the array. foreach (module_implements('node_load') as $module) { - $function = $module . '_node_load'; + $function = $module . '__node_load'; $function($queried_nodes, array_keys($typed_nodes)); } $nodes += $queried_nodes; diff --git a/modules/search/search.admin.inc b/modules/search/search.admin.inc index a31c404..fdc54d1 100644 --- a/modules/search/search.admin.inc +++ b/modules/search/search.admin.inc @@ -39,7 +39,7 @@ function search_admin_settings() { $remaining = 0; $total = 0; foreach (module_implements('search') as $module) { - $function = $module . '_search'; + $function = $module . '__search'; $status = $function('status'); $remaining += $status['remaining']; $total += $status['total']; diff --git a/modules/simpletest/tests/field_test.module b/modules/simpletest/tests/field_test.module index daa2e04..08b3a4d 100644 --- a/modules/simpletest/tests/field_test.module +++ b/modules/simpletest/tests/field_test.module @@ -417,7 +417,7 @@ function field_test_field_sanitize($obj_type, $object, $field, $instance, &$item /** * Implement hook_field_is_empty(). */ -function field_test_field_is_empty($item, $field) { +function field_test__field_is_empty($item, $field) { return empty($item['value']); } diff --git a/modules/system/system.api.php b/modules/system/system.api.php index 1459b45..3c9f042 100644 --- a/modules/system/system.api.php +++ b/modules/system/system.api.php @@ -1622,13 +1622,13 @@ function hook_install() { * core API. * * Examples: - * - mymodule_update_5200() + * - mymodule__update_5200() * - This is the first update to get the database ready to run mymodule 5.x-2.*. - * - mymodule_update_6000() + * - mymodule__update_6000() * - This is the required update for mymodule to run with Drupal core API 6.x. - * - mymodule_update_6100() + * - mymodule__update_6100() * - This is the first update to get the database ready to run mymodule 6.x-1.*. - * - mymodule_update_6200() + * - mymodule__update_6200() * - This is the first update to get the database ready to run mymodule 6.x-2.*. * Users can directly update from 5.x-2.* to 6.x-2.* and they get all 60XX * and 62XX updates, but not 61XX updates, because those reside in the @@ -1721,7 +1721,7 @@ function hook_update_N(&$sandbox = NULL) { */ function hook_update_last_removed() { // We've removed the 5.x-1.x version of mymodule, including database updates. - // The next update function is mymodule_update_5200(). + // The next update function is mymodule__update_5200(). return 5103; } diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index ab774eb..228448f 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1889,7 +1889,7 @@ function taxonomy_field_validate($obj_type, $object, $field, $instance, $items, /** * Implement hook_field_is_empty(). */ -function taxonomy_field_is_empty($item, $field) { +function taxonomy__field_is_empty($item, $field) { if (empty($item['value']) && (string) $item['value'] !== '0') { return TRUE; } diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 1c44687..163d3e3 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -963,7 +963,7 @@ function user_modules_installed($modules) { function user_modules_uninstalled($modules) { $permissions = array(); foreach ($modules as $module) { - if (drupal_function_exists($module . '_permission')) { + if (drupal_function_exists($module . '__permission')) { $permissions = array_merge($permissions, array_keys(module_invoke($module, 'permission'))); } } diff --git a/modules/user/user.module b/modules/user/user.module index 11d9b0b..dcc0e73 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -25,7 +25,7 @@ define('EMAIL_MAX_LENGTH', 64); */ function user_module_invoke($type, &$edit, $account, $category = NULL) { foreach (module_implements('user_' . $type) as $module) { - $function = $module . '_user_' . $type; + $function = $module . '__user_' . $type; $function($edit, $account, $category); } } @@ -244,7 +244,7 @@ function user_load_multiple($uids = array(), $conditions = array(), $reset = FAL // Invoke hook_user_load() on the users loaded from the database // and add them to the static cache. foreach (module_implements('user_load') as $module) { - $function = $module . '_user_load'; + $function = $module . '__user_load'; $function($queried_users); } @@ -2464,7 +2464,7 @@ function user_filters() { $options = array(); foreach (module_implements('permission') as $module) { - $function = $module . '_permission'; + $function = $module . '__permission'; if ($permissions = $function('permission')) { asort($permissions); foreach ($permissions as $permission => $description) { @@ -2959,7 +2959,7 @@ function user_register_validate($form, &$form_state) { function _user_forms(&$edit, $account, $category, $hook = 'form') { $groups = array(); foreach (module_implements('user_' . $hook) as $module) { - $function = $module . '_user_' . $hook; + $function = $module . '__user_' . $hook; if ($data = $function($edit, $account, $category)) { $groups = array_merge_recursive($data, $groups); } diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine index 4cd53f7..3251713 100644 --- a/themes/engines/phptemplate/phptemplate.engine +++ b/themes/engines/phptemplate/phptemplate.engine @@ -19,7 +19,7 @@ function phptemplate_init($template) { * pre-defined by Drupal so that we can use that information if * we need to. */ -function phptemplate_theme($existing, $type, $theme, $path) { +function phptemplate__theme($existing, $type, $theme, $path) { $templates = drupal_find_theme_functions($existing, array($theme)); $templates += drupal_find_theme_templates($existing, '.tpl.php', $path); return $templates; diff --git a/update.php b/update.php index 150823e..ae48bdb 100644 --- a/update.php +++ b/update.php @@ -70,7 +70,7 @@ function update_script_selection_form() { foreach (array_keys($updates) as $update) { if ($update > $schema_version) { // The description for an update comes from its Doxygen. - $func = new ReflectionFunction($module . '_update_' . $update); + $func = new ReflectionFunction($module . '__update_' . $update); $description = str_replace(array("\n", '*', '/'), '', $func->getDocComment()); $pending[] = "$update - $description"; if (!isset($default)) { commit 45a80a963f3ee7ed2b234734fb4ace1ea77c47b7 Author: Damien Tournoud Date: Thu Aug 13 23:10:37 2009 +0200 #548470, bulk conversion part. diff --git a/includes/actions.inc b/includes/actions.inc index c444b60..ae25a46 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -109,7 +109,7 @@ function actions_do($action_ids, $object = NULL, $context = NULL, $a1 = NULL, $a } /** - * Discover all action functions by invoking hook_action_info(). + * Discover all action functions by invoking hook__action_info(). * * @code * mymodule_action_info() { @@ -168,7 +168,7 @@ function actions_list($reset = FALSE) { * Retrieve all action instances from the database. * * Compare with actions_list() which gathers actions by invoking - * hook_action_info(). The two are synchronized by visiting + * hook__action_info(). The two are synchronized by visiting * /admin/structure/actions (when actions.module is enabled) which runs * actions_synchronize(). * diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 0c85173..23981cb 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -997,7 +997,7 @@ function drupal_serve_page_from_cache(stdClass $cache) { $page_compression = variable_get('page_compression', TRUE) && extension_loaded('zlib'); $return_compressed = $page_compression && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== FALSE; - // Get headers set in hook_boot(). Keys are lower-case. + // Get headers set in hook__boot(). Keys are lower-case. $hook_boot_headers = drupal_get_header(); // Headers generated in this function, that may be replaced or unset using @@ -1007,7 +1007,7 @@ function drupal_serve_page_from_cache(stdClass $cache) { foreach ($cache->headers as $name => $value) { // In the case of a 304 response, certain headers must be sent, and the // remaining may not (see RFC 2616, section 10.3.5). Do not override - // headers set in hook_boot(). + // headers set in hook__boot(). $name_lower = strtolower($name); if (in_array($name_lower, array('content-location', 'expires', 'cache-control', 'vary')) && !isset($hook_boot_headers[$name_lower])) { drupal_set_header($name, $value); @@ -1020,7 +1020,7 @@ function drupal_serve_page_from_cache(stdClass $cache) { // proxies with aggressive caching. If the client send a session cookie, do // not bother caching the page in a public proxy, because the cached copy // will only be served to that particular user due to Vary: Cookie, unless - // the Vary header has been replaced or unset in hook_boot() (see below). + // the Vary header has been replaced or unset in hook__boot() (see below). $max_age = variable_get('cache') == CACHE_AGGRESSIVE && (!isset($_COOKIE[session_name()]) || isset($hook_boot_headers['vary'])) ? variable_get('cache_lifetime', 0) : 0; $default_headers['Cache-Control'] = 'public, max-age=' . $max_age; @@ -1059,7 +1059,7 @@ function drupal_serve_page_from_cache(stdClass $cache) { // cookie. The Vary header is used to indicates the set of request-header // fields that fully determines whether a cache is permitted to use the // response to reply to a subsequent request for a given URL without - // revalidation. If a Vary header has been set in hook_boot(), it is assumed + // revalidation. If a Vary header has been set in hook__boot(), it is assumed // that the module knows how to cache the page. if (!isset($hook_boot_headers['vary']) && !variable_get('omit_vary_cookie')) { header('Vary: Cookie'); @@ -1190,7 +1190,7 @@ function request_uri() { * A link to associate with the message. * * @see watchdog_severity_levels() - * @see hook_watchdog() + * @see hook__watchdog() */ function watchdog($type, $message, $variables = array(), $severity = WATCHDOG_NOTICE, $link = NULL) { global $user, $base_root; @@ -1503,7 +1503,7 @@ function _drupal_bootstrap($phase) { case DRUPAL_BOOTSTRAP_PATH: require_once DRUPAL_ROOT . '/includes/path.inc'; - // Initialize $_GET['q'] prior to loading modules and invoking hook_init(). + // Initialize $_GET['q'] prior to loading modules and invoking hook__init(). drupal_path_initialize(); break; @@ -1701,7 +1701,7 @@ function ip_address() { * Get the schema definition of a table, or the whole database schema. * * The returned schema will include any modifications made by any - * module that implements hook_schema_alter(). + * module that implements hook__schema_alter(). * * @param $table * The name of the table. If not given, the schema of all tables is returned. diff --git a/includes/cache.inc b/includes/cache.inc index 6c8eb09..218cadf 100644 --- a/includes/cache.inc +++ b/includes/cache.inc @@ -71,7 +71,7 @@ function cache_get_multiple(array &$cids, $bin = 'cache') { * might break functionality or are extremely expensive to recalculate. These * will be marked with a (*). The other bins expired automatically by core. * Contributed modules can add additional bins and get them expired - * automatically by implementing hook_flush_caches(). + * automatically by implementing hook__flush_caches(). * * - cache: Generic cache storage bin (used for variables, theme registry, * locale date, list of simpletest tests etc). diff --git a/includes/common.inc b/includes/common.inc index 55333f5..4f333a5 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -534,7 +534,7 @@ function drupal_http_request($url, array $options = array()) { // Mark that this request failed. This will trigger a check of the web // server's ability to make outgoing HTTP requests the next time that // requirements checking is performed. - // @see system_requirements() + // @see system__requirements() variable_set('drupal_http_request_fails', TRUE); return $result; @@ -1131,7 +1131,7 @@ function fix_gpc_magic() { * Instead, translation of these data can be done through the locale system, * either directly or through helper functions provided by contributed * modules. - * @see hook_locale() + * @see hook__locale() * * During installation, st() is used in place of t(). Code that may be called * during installation or during normal operation should use the get_t() @@ -2270,7 +2270,7 @@ function l($text, $path, array $options = array()) { * Perform end-of-request tasks. * * This function sets the page cache if appropriate, and allows modules to - * react to the closing of the page by calling hook_exit(). + * react to the closing of the page by calling hook__exit(). */ function drupal_page_footer() { global $user; @@ -2974,12 +2974,12 @@ function drupal_js_defaults($data = NULL) { * are added to the page. Then, all settings are output, followed by 'inline' * JavaScript code. If running update.php, all preprocessing is disabled. * - * Note that hook_js_alter(&$javascript) is called during this function call + * Note that hook__js_alter(&$javascript) is called during this function call * to allow alterations of the JavaScript during its presentation. Calls to - * drupal_add_js() from hook_js_alter() will not be added to the output - * presentation. The correct way to add JavaScript during hook_js_alter() + * drupal_add_js() from hook__js_alter() will not be added to the output + * presentation. The correct way to add JavaScript during hook__js_alter() * is to add another element to the $javascript array, deriving from - * drupal_js_defaults(). See locale_js_alter() for an example of this. + * drupal_js_defaults(). See locale__js_alter() for an example of this. * * @param $scope * (optional) The scope for which the JavaScript rules should be returned. @@ -2990,7 +2990,7 @@ function drupal_js_defaults($data = NULL) { * @return * All JavaScript code segments and includes for the scope as HTML tags. * @see drupal_add_js() - * @see locale_js_alter() + * @see locale__js_alter() * @see drupal_js_defaults() */ function drupal_get_js($scope = 'header', $javascript = NULL) { @@ -3097,8 +3097,8 @@ function drupal_get_js($scope = 'header', $javascript = NULL) { * of its dependencies could not be added. * * @see drupal_get_library() - * @see hook_library() - * @see hook_library_alter() + * @see hook__library() + * @see hook__library_alter() */ function drupal_add_library($module, $name) { $added = &drupal_static(__FUNCTION__, array()); @@ -3166,8 +3166,8 @@ function drupal_add_library($module, $name) { * The definition of the requested library, if existent, or FALSE. * * @see drupal_add_library() - * @see hook_library() - * @see hook_library_alter() + * @see hook__library() + * @see hook__library_alter() * * @todo The purpose of drupal_get_*() is completely different to other page * requisite API functions; find and use a different name. @@ -3767,7 +3767,7 @@ function drupal_alter($type, &$data) { // PHP's func_get_args() always returns copies of params, not references, so // drupal_alter() can only manipulate data that comes in via the required first // param. For the edge case functions that must pass in an arbitrary number of - // alterable parameters (hook_form_alter() being the best example), an array of + // alterable parameters (hook__form_alter() being the best example), an array of // those params can be placed in the __drupal_alter_by_ref key of the $data // array. This is somewhat ugly, but is an unavoidable consequence of a flexible // drupal_alter() function, and the limitations of func_get_args(). @@ -3829,7 +3829,7 @@ function drupal_set_page_content($content = NULL) { * - #show_blocks: A marker which suppresses sidebar regions if FALSE (optional). * - #show_messages: Suppress drupal_get_message() items. Used by Batch API (optional). * - * @see hook_page_alter() + * @see hook__page_alter() * @see element_info('page') */ function drupal_render_page($page) { @@ -4382,10 +4382,10 @@ function drupal_common_theme() { */ /** - * Create all tables that a module defines in its hook_schema(). + * Create all tables that a module defines in its hook__schema(). * * Note: This function does not pass the module's schema through - * hook_schema_alter(). The module's tables will be created exactly as the + * hook__schema_alter(). The module's tables will be created exactly as the * module defines them. * * @param $module @@ -4407,10 +4407,10 @@ function drupal_install_schema($module) { } /** - * Remove all tables that a module defines in its hook_schema(). + * Remove all tables that a module defines in its hook__schema(). * * Note: This function does not pass the module's schema through - * hook_schema_alter(). The module's tables will be created exactly as the + * hook__schema_alter(). The module's tables will be created exactly as the * module defines them. * * @param $module @@ -4438,18 +4438,18 @@ function drupal_uninstall_schema($module) { * * Use this function only if you explicitly need the original * specification of a schema, as it was defined in a module's - * hook_schema(). No additional default values will be set, - * hook_schema_alter() is not invoked and these unprocessed + * hook__schema(). No additional default values will be set, + * hook__schema_alter() is not invoked and these unprocessed * definitions won't be cached. * * This function can be used to retrieve a schema specification in - * hook_schema(), so it allows you to derive your tables from existing + * hook__schema(), so it allows you to derive your tables from existing * specifications. * * It is also used by drupal_install_schema() and * drupal_uninstall_schema() to ensure that a module's tables are * created exactly as specified without any changes introduced by a - * module that implements hook_schema_alter(). + * module that implements hook__schema_alter(). * * @param $module * The module to which the table belongs. @@ -4471,13 +4471,13 @@ function drupal_get_schema_unprocessed($module, $table = NULL) { } /** - * Fill in required default values for table definitions returned by hook_schema(). + * Fill in required default values for table definitions returned by hook__schema(). * * @param $module - * The module for which hook_schema() was invoked. + * The module for which hook__schema() was invoked. * @param $schema * The schema definition array as it was returned by the module's - * hook_schema(). + * hook__schema(). */ function _drupal_schema_initialize($module, &$schema) { // Set the name and module key for all tables. diff --git a/includes/database/database.inc b/includes/database/database.inc index d5f6d7a..43ff127 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -2553,7 +2553,7 @@ function _db_query_process_args($query, $args, $options) { /** * Helper function for db_rewrite_sql. * - * Collects JOIN and WHERE statements via hook_db_rewrite_sql() + * Collects JOIN and WHERE statements via hook__db_rewrite_sql() * Decides whether to select primary_key or DISTINCT(primary_key) * * @todo Remove this function when all code has been converted to query_alter. diff --git a/includes/database/schema.inc b/includes/database/schema.inc index fe1e982..b19e525 100644 --- a/includes/database/schema.inc +++ b/includes/database/schema.inc @@ -12,15 +12,15 @@ * * A Drupal schema definition is an array structure representing one or * more tables and their related keys and indexes. A schema is defined by - * hook_schema(), which usually lives in a modulename.install file. + * hook__schema(), which usually lives in a modulename.install file. * - * By implementing hook_schema() and specifying the tables your module + * By implementing hook__schema() and specifying the tables your module * declares, you can easily create and drop these tables on all * supported database engines. You don't have to deal with the * different SQL dialects for table creation and alteration of the * supported database engines. * - * hook_schema() should return an array with a key for each table that + * hook__schema() should return an array with a key for each table that * the module defines. * * The following keys are defined: diff --git a/includes/file.inc b/includes/file.inc index 1ec96cd..ae14e77 100644 --- a/includes/file.inc +++ b/includes/file.inc @@ -105,8 +105,8 @@ define('FILE_STATUS_PERMANENT', 1); * * @return * Returns the entire Drupal stream wrapper registry. - * @see hook_stream_wrappers() - * @see hook_stream_wrappers_alter() + * @see hook__stream_wrappers() + * @see hook__stream_wrappers_alter() */ function file_get_stream_wrappers() { $wrappers = &drupal_static(__FUNCTION__); @@ -490,7 +490,7 @@ function file_check_location($source, $directory = '') { * @return * An array of file objects, indexed by fid. * - * @see hook_file_load() + * @see hook__file_load() * @see file_load() */ function file_load_multiple($fids = array(), $conditions = array()) { @@ -509,7 +509,7 @@ function file_load_multiple($fids = array(), $conditions = array()) { } $files = $query->execute()->fetchAllAssoc('fid'); - // Invoke hook_file_load() on the terms loaded from the database + // Invoke hook__file_load() on the terms loaded from the database // and add them to the static cache. if (!empty($files)) { foreach (module_implements('file_load') as $module) { @@ -528,7 +528,7 @@ function file_load_multiple($fids = array(), $conditions = array()) { * @return * A file object. * - * @see hook_file_load() + * @see hook__file_load() * @see file_load_multiple() */ function file_load($fid) { @@ -547,8 +547,8 @@ function file_load($fid) { * @return * The updated file object. * - * @see hook_file_insert() - * @see hook_file_update() + * @see hook__file_insert() + * @see hook__file_update() */ function file_save($file) { $file = (object)$file; @@ -602,7 +602,7 @@ function file_save($file) { * File object if the copy is successful, or FALSE in the event of an error. * * @see file_unmanaged_copy() - * @see hook_file_copy() + * @see hook__file_copy() */ function file_copy($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) { $source = (object)$source; @@ -781,7 +781,7 @@ function file_destination($destination, $replace) { * Resulting file object for success, or FALSE in the event of an error. * * @see file_unmanaged_move() - * @see hook_file_move() + * @see hook__file_move() */ function file_move($source, $destination = NULL, $replace = FILE_EXISTS_RENAME) { $source = (object)$source; @@ -949,7 +949,7 @@ function file_create_filename($basename, $directory) { /** * Delete a file and its database record. * - * If the $force parameter is not TRUE hook_file_references() will be called + * If the $force parameter is not TRUE hook__file_references() will be called * to determine if the file is being used by any modules. If the file is being * used is the delete will be canceled. * @@ -957,15 +957,15 @@ function file_create_filename($basename, $directory) { * A file object. * @param $force * Boolean indicating that the file should be deleted even if - * hook_file_references() reports that the file is in use. + * hook__file_references() reports that the file is in use. * @return mixed * TRUE for success, FALSE in the event of an error, or an array if the file * is being used by another module. The array keys are the module's name and * the values are the number of references. * * @see file_unmanaged_delete() - * @see hook_file_references() - * @see hook_file_delete() + * @see hook__file_references() + * @see hook__file_delete() */ function file_delete($file, $force = FALSE) { $file = (object)$file; @@ -1245,7 +1245,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, /** * Check that a file meets the criteria specified by the validators. * - * After executing the validator callbacks specified hook_file_validate() will + * After executing the validator callbacks specified hook__file_validate() will * also be called to allow other modules to report errors about the file. * * @param $file @@ -1260,7 +1260,7 @@ function file_save_upload($source, $validators = array(), $destination = FALSE, * @return * An array contaning validation error messages. * - * @see hook_file_validate() + * @see hook__file_validate() */ function file_validate(&$file, $validators = array()) { // Call the validation functions specified by this function's caller. @@ -1307,7 +1307,7 @@ function file_validate_name_length($file) { * An array. If the file extension is not allowed, it will contain an error * message. * - * @see hook_file_validate() + * @see hook__file_validate() */ function file_validate_extensions($file, $extensions) { $errors = array(); @@ -1336,7 +1336,7 @@ function file_validate_extensions($file, $extensions) { * An array. If the file size exceeds limits, it will contain an error * message. * - * @see hook_file_validate() + * @see hook__file_validate() */ function file_validate_size($file, $file_limit = 0, $user_limit = 0) { global $user; @@ -1365,7 +1365,7 @@ function file_validate_size($file, $file_limit = 0, $user_limit = 0) { * @return * An array. If the file is not an image, it will contain an error message. * - * @see hook_file_validate() + * @see hook__file_validate() */ function file_validate_is_image($file) { $errors = array(); @@ -1400,7 +1400,7 @@ function file_validate_is_image($file) { * An array. If the file is an image and did not meet the requirements, it * will contain an error message. * - * @see hook_file_validate() + * @see hook__file_validate() */ function file_validate_image_resolution($file, $maximum_dimensions = 0, $minimum_dimensions = 0) { $errors = array(); @@ -1563,13 +1563,13 @@ function file_transfer($source, $headers) { /** * Menu handler for private file transfers. * - * Call modules that implement hook_file_download() to find out if a file is + * Call modules that implement hook__file_download() to find out if a file is * accessible and what headers it should be transferred with. If a module * returns -1 drupal_access_denied() will be returned. If one or more modules * returned headers the download will start with the returned headers. If no * modules respond drupal_not_found() will be returned. * - * @see hook_file_download() + * @see hook__file_download() */ function file_download() { // Merge remainder of arguments from GET['q'], into relative file path. diff --git a/includes/form.inc b/includes/form.inc index db9af87..d1e3bdc 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -53,9 +53,9 @@ * The unique string identifying the desired form. If a function with that * name exists, it is called to build the form array. Modules that need to * generate the same form (or very similar forms) using different $form_ids - * can implement hook_forms(), which maps different $form_id values to the - * proper form constructor function. Examples may be found in node_forms(), - * search_forms(), and user_forms(). + * can implement hook__forms(), which maps different $form_id values to the + * proper form constructor function. Examples may be found in node__forms(), + * search__forms(), and user__forms(). * @param ... * Any additional arguments are passed on to the functions called by * drupal_get_form(), including the unique form constructor function. For @@ -88,9 +88,9 @@ function drupal_get_form($form_id) { * The unique string identifying the desired form. If a function with that * name exists, it is called to build the form array. Modules that need to * generate the same form (or very similar forms) using different $form_ids - * can implement hook_forms(), which maps different $form_id values to the - * proper form constructor function. Examples may be found in node_forms(), - * search_forms(), and user_forms(). + * can implement hook__forms(), which maps different $form_id values to the + * proper form constructor function. Examples may be found in node__forms(), + * search__forms(), and user__forms(). * @param &$form_state * An array which stores information about the form. This is passed as a * reference so that the caller can use it to examine what the form changed @@ -248,9 +248,9 @@ function form_state_defaults() { * The unique string identifying the desired form. If a function * with that name exists, it is called to build the form array. * Modules that need to generate the same form (or very similar forms) - * using different $form_ids can implement hook_forms(), which maps + * using different $form_ids can implement hook__forms(), which maps * different $form_id values to the proper form constructor function. Examples - * may be found in node_forms(), search_forms(), and user_forms(). + * may be found in node__forms(), search__forms(), and user__forms(). * @param $form_state * A keyed array containing the current state of the form. Most * important is the $form_state['storage'] collection. @@ -334,9 +334,9 @@ function form_set_cache($form_build_id, $form, $form_state) { * The unique string identifying the desired form. If a function * with that name exists, it is called to build the form array. * Modules that need to generate the same form (or very similar forms) - * using different $form_ids can implement hook_forms(), which maps + * using different $form_ids can implement hook__forms(), which maps * different $form_id values to the proper form constructor function. Examples - * may be found in node_forms(), search_forms(), and user_forms(). + * may be found in node__forms(), search__forms(), and user__forms(). * @param $form_state * A keyed array containing the current state of the form. Most * important is the $form_state['values'] collection, a tree of data @@ -396,7 +396,7 @@ function drupal_form_submit($form_id, &$form_state) { * The unique string identifying the desired form. If a function * with that name exists, it is called to build the form array. * Modules that need to generate the same form (or very similar forms) - * using different $form_ids can implement hook_forms(), which maps + * using different $form_ids can implement hook__forms(), which maps * different $form_id values to the proper form constructor function. * @param $form_state * A keyed array containing the current state of the form. @@ -404,7 +404,7 @@ function drupal_form_submit($form_id, &$form_state) { * Any additional arguments needed by the unique form constructor * function. Generally, these are any arguments passed into the * drupal_get_form() or drupal_form_submit() functions after the first - * argument. If a module implements hook_forms(), it can examine + * argument. If a module implements hook__forms(), it can examine * these additional arguments and conditionally return different * builder functions as well. */ @@ -420,7 +420,7 @@ function drupal_retrieve_form($form_id, &$form_state) { // If there is, we simply pass the arguments on to it to get the form. if (!drupal_function_exists($form_id)) { // In cases where many form_ids need to share a central constructor function, - // such as the node editing form, modules can implement hook_forms(). It + // such as the node editing form, modules can implement hook__forms(). It // maps one or more form_ids to the correct constructor functions. // // We cache the results of that hook to save time, but that only works @@ -445,7 +445,7 @@ function drupal_retrieve_form($form_id, &$form_state) { $args = array_merge(array(&$form_state), $args); - // If $callback was returned by a hook_forms() implementation, call it. + // If $callback was returned by a hook__forms() implementation, call it. // Otherwise, call the function named after the form id. $form = call_user_func_array(isset($callback) ? $callback : $form_id, $args); $form['#form_id'] = $form_id; @@ -560,7 +560,7 @@ function drupal_process_form($form_id, &$form, &$form_state) { * An associative array containing the structure of the form. * @param $form_state * A keyed array containing the current state of the form. Passed - * in here so that hook_form_alter() calls can use it, as well. + * in here so that hook__form_alter() calls can use it, as well. */ function drupal_prepare_form($form_id, &$form, &$form_state) { global $user; @@ -629,7 +629,7 @@ function drupal_prepare_form($form_id, &$form, &$form_state) { // However, drupal_alter() normally supports just one byref parameter. Using // the __drupal_alter_by_ref key, we can store any additional parameters // that need to be altered, and they'll be split out into additional params - // for the hook_form_alter() implementations. + // for the hook__form_alter() implementations. // @todo: Remove this in Drupal 7. $data = &$form; $data['__drupal_alter_by_ref'] = array(&$form_state); @@ -1918,7 +1918,7 @@ function form_process_radios($element) { * $form_state['values']['body_format'] = 1; * @endcode * - * @see system_elements(), filter_form() + * @see system__elements(), filter_form() */ function form_process_text_format($element) { if (isset($element['#text_format'])) { diff --git a/includes/install.inc b/includes/install.inc index 995c6fc..9c99a32 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -1000,7 +1000,7 @@ function drupal_check_profile($profile) { * * @param $requirements * An array of requirements, in the same format as is returned by - * hook_requirements(). + * hook__requirements(). * @return * The highest severity in the array. */ diff --git a/includes/mail.inc b/includes/mail.inc index 102a777..70bbf90 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -7,8 +7,8 @@ * Sending an e-mail works with defining an e-mail template (subject, text * and possibly e-mail headers) and the replacement values to use in the * appropriate places in the template. Processed e-mail templates are - * requested from hook_mail() from the module sending the e-mail. Any module - * can modify the composed e-mail message array using hook_mail_alter(). + * requested from hook__mail() from the module sending the e-mail. Any module + * can modify the composed e-mail message array using hook__mail_alter(). * Finally drupal_mail_send() sends the e-mail, which can be reused * if the exact same composed e-mail is to be sent to multiple recipients. * @@ -52,7 +52,7 @@ * @endcode * * @param $module - * A module name to invoke hook_mail() on. The {$module}_mail() hook will be + * A module name to invoke hook__mail() on. The {$module}_mail() hook will be * called to complete the $message structure which will already contain common * defaults. * @param $key @@ -113,13 +113,13 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N $message['headers'] = $headers; // Build the e-mail (get subject and body, allow additional headers) by - // invoking hook_mail() on this module. We cannot use module_invoke() as - // we need to have $message by reference in hook_mail(). + // invoking hook__mail() on this module. We cannot use module_invoke() as + // we need to have $message by reference in hook__mail(). if (drupal_function_exists($function = $module . '__mail')) { $function($key, $message, $params); } - // Invoke hook_mail_alter() to allow all modules to alter the resulting e-mail. + // Invoke hook__mail_alter() to allow all modules to alter the resulting e-mail. drupal_alter('mail', $message); // Concatenate and wrap the e-mail body. diff --git a/includes/menu.inc b/includes/menu.inc index 2d7959e..c9a4bdb 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -17,7 +17,7 @@ * menu system is fundamental to the creation of complex modules. * * Drupal's menu system follows a simple hierarchy defined by paths. - * Implementations of hook_menu() define menu items and assign them to + * Implementations of hook__menu() define menu items and assign them to * paths (which should be unique). The menu system aggregates these items * and determines the menu hierarchy from the paths. For example, if the * paths defined were a, a/b, e, a/b/c/d, f/g, and a/b/h, the menu system @@ -435,7 +435,7 @@ function _menu_load_objects(&$item, &$map) { $value = isset($path_map[$index]) ? $path_map[$index] : ''; if (is_array($function)) { // Set up arguments for the load function. These were pulled from - // 'load arguments' in the hook_menu() entry, but they need + // 'load arguments' in the hook__menu() entry, but they need // some processing. In this case the $function is the key to the // load_function array, and the value is the list of arguments. list($function, $args) = each($function); diff --git a/includes/module.inc b/includes/module.inc index d186a3a..a576f98 100644 --- a/includes/module.inc +++ b/includes/module.inc @@ -308,7 +308,7 @@ function module_disable($module_list) { * The available hooks to implement are explained here in the Hooks section of * the developer documentation. The string "hook" is used as a placeholder for * the module name is the hook definitions. For example, if the module file is - * called example.module, then hook_help() as implemented by that module would be + * called example.module, then hook__help() as implemented by that module would be * defined as example_help(). */ diff --git a/includes/path.inc b/includes/path.inc index d543ca4..076c0c2 100644 --- a/includes/path.inc +++ b/includes/path.inc @@ -6,7 +6,7 @@ * Functions to handle paths in Drupal, including path aliasing. * * These functions are not loaded for cached pages, but modules that need - * to use them in hook_init() or hook exit() can make them available, by + * to use them in hook__init() or hook exit() can make them available, by * executing "drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH);". */ @@ -344,7 +344,7 @@ function drupal_match_path($path, $patterns) { * - http://example.com/path/alias (which is a path alias for node/306) returns * "node/306" as opposed to the path alias. * - * This function is not available in hook_boot() so use $_GET['q'] instead. + * This function is not available in hook__boot() so use $_GET['q'] instead. * However, be careful when doing that because in the case of Example #3 * $_GET['q'] will contain "path/alias". If "node/306" is needed, calling * drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH) makes this function available. diff --git a/includes/registry.inc b/includes/registry.inc index 7946dc3..c2567f7 100644 --- a/includes/registry.inc +++ b/includes/registry.inc @@ -44,7 +44,7 @@ function _registry_rebuild() { foreach ($modules as &$module) { $dir = dirname($module->filepath); - // Store the module directory for use in hook_registry_files_alter(). + // Store the module directory for use in hook__registry_files_alter(). $module->dir = $dir; if ($module->status) { diff --git a/includes/theme.inc b/includes/theme.inc index 6739687..f98f77b 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -262,7 +262,7 @@ function drupal_theme_rebuild() { } /** - * Process a single implementation of hook_theme(). + * Process a single implementation of hook__theme(). * * @param $cache * The theme registry that will eventually be cached; It is an associative @@ -271,30 +271,30 @@ function drupal_theme_rebuild() { * - 'type': The passed in $type. * - 'theme path': The passed in $path. * - 'function': The name of the function generating output for this theme - * hook. Either defined explicitly in hook_theme() or, if neither 'function' + * hook. Either defined explicitly in hook__theme() or, if neither 'function' * nor 'template' is defined, then the default theme function name is used. * The default theme function name is the theme hook prefixed by either * 'theme_' for modules or '$name_' for everything else. If 'function' is * defined, 'template' is not used. * - 'template': The filename of the template generating output for this * theme hook. The template is in the directory defined by the 'path' key of - * hook_theme() or defaults to $path. + * hook__theme() or defaults to $path. * - 'arguments': The arguments for this theme hook as defined in - * hook_theme(). If there is more than one implementation and 'arguments' is + * hook__theme(). If there is more than one implementation and 'arguments' is * not specified in a later one, then the previous definition is kept. * - 'theme paths': The paths where implementations of a theme hook can be * found. Its definition is similarly inherited like 'arguments'. Each time * _theme_process_registry() is called for this theme hook, either the - * 'path' key from hook_theme() (if defined) or $path is added. + * 'path' key from hook__theme() (if defined) or $path is added. * - 'preprocess functions': See theme() for detailed documentation. * - 'process functions': See theme() for detailed documentation. * @param $name * The name of the module, theme engine, base theme engine, theme or base - * theme implementing hook_theme(). + * theme implementing hook__theme(). * @param $type * One of 'module', 'theme_engine', 'base_theme_engine', 'theme', or * 'base_theme'. Unlike regular hooks that can only be implemented by modules, - * each of these can implement hook_theme(). _theme_process_registry() is + * each of these can implement hook__theme(). _theme_process_registry() is * called in aforementioned order and new entries override older ones. For * example, if a theme hook is both defined by a module and a theme, then the * definition in the theme will be used. @@ -306,7 +306,7 @@ function drupal_theme_rebuild() { * * @see theme() * @see _theme_process_registry() - * @see hook_theme() + * @see hook__theme() * @see list_themes() */ function _theme_process_registry(&$cache, $name, $type, $theme, $path) { @@ -727,7 +727,7 @@ function theme() { // If a theme function that does not expect a renderable array is called // with a renderable array as the only argument (via drupal_render), then // we take the arguments from the properties of the renderable array. If - // missing, use hook_theme() defaults. + // missing, use hook__theme() defaults. if (isset($args[0]) && is_array($args[0]) && isset($args[0]['#theme']) && count($info['arguments']) > 1) { $new_args = array(); foreach ($info['arguments'] as $name => $default) { @@ -1175,7 +1175,7 @@ function theme_render_template($template_file, $variables) { * to make it simple for themes to identify and override the behavior * for these calls. * - * The theme hooks are registered via hook_theme(), which returns an + * The theme hooks are registered via hook__theme(), which returns an * array of arrays with information about the hook. It describes the * arguments the function or template will need, and provides * defaults for the template in case they are not filled in. If the default @@ -1183,7 +1183,7 @@ function theme_render_template($template_file, $variables) { * * Each module should provide a default implementation for theme_hooks that * it registers. This implementation may be either a function or a template; - * if it is a function it must be specified via hook_theme(). By convention, + * if it is a function it must be specified via hook__theme(). By convention, * default implementations of theme hooks are named theme_HOOK. Default * template implementations are stored in the module directory. * @@ -1198,7 +1198,7 @@ function theme_render_template($template_file, $variables) { * implement their own version of theme hooks, either as functions or templates. * These implementations will be used instead of the default implementation. If * using a pure .theme without an engine, the .theme is required to implement - * its own version of hook_theme() to tell Drupal what it is implementing; + * its own version of hook__theme() to tell Drupal what it is implementing; * themes utilizing an engine will have their well-named theming functions * automatically registered for them. While this can vary based upon the theme * engine, the standard set by phptemplate is that theme functions should be @@ -1209,7 +1209,7 @@ function theme_render_template($template_file, $variables) { * The theme system is described and defined in theme.inc. * * @see theme() - * @see hook_theme() + * @see hook__theme() */ /** diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 51c6c1e..e1e6b28 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -63,7 +63,7 @@ function _drupal_maintenance_theme() { } _drupal_theme_initialize($themes[$theme], array_reverse($base_theme), '_theme_load_offline_registry'); - // These are usually added from system_init() -except maintenance.css. + // These are usually added from system__init() -except maintenance.css. // When the database is inactive it's not called so we add it here. drupal_add_css(drupal_get_path('module', 'system') . '/defaults.css'); drupal_add_css(drupal_get_path('module', 'system') . '/system.css'); diff --git a/install.php b/install.php index 092b350..6ee520b 100644 --- a/install.php +++ b/install.php @@ -1618,7 +1618,7 @@ function _install_configure_form(&$form_state, &$install_state) { ); // Allow the profile to alter this form. $form_state isn't available - // here, but to conform to the hook_form_alter() signature, we pass + // here, but to conform to the hook__form_alter() signature, we pass // an empty array. $hook_form_alter = $install_state['parameters']['profile'] . '__form_alter'; if (function_exists($hook_form_alter)) { diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index c9260a3..2f8f853 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -10,7 +10,7 @@ * Menu callback; displays the aggregator administration page. */ function aggregator_admin_overview() { - return aggregator_view(); + return aggregator__view(); } /** @@ -19,7 +19,7 @@ function aggregator_admin_overview() { * @return * The page HTML. */ -function aggregator_view() { +function aggregator__view() { $result = db_query('SELECT f.*, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.hash, f.etag, f.modified, f.image, f.block ORDER BY f.title'); $output = '

' . t('Feed overview') . '

'; diff --git a/modules/aggregator/aggregator.api.php b/modules/aggregator/aggregator.api.php index 539dbc9..c207043 100644 --- a/modules/aggregator/aggregator.api.php +++ b/modules/aggregator/aggregator.api.php @@ -28,13 +28,13 @@ * $feed->url contains the link to the feed. Download the data at the URL * and expose it to other modules by attaching it to $feed->source_string. * - * @see hook_aggregator_fetch_info() - * @see hook_aggregator_parse() - * @see hook_aggregator_process() + * @see hook__aggregator_fetch_info() + * @see hook__aggregator_parse() + * @see hook__aggregator_process() * * @ingroup aggregator */ -function hook_aggregator_fetch($feed) { +function hook__aggregator_fetch($feed) { $feed->source_string = mymodule_fetch($feed->url); } @@ -47,18 +47,18 @@ function hook_aggregator_fetch($feed) { * readable name of the fetcher and as description a brief (40 to 80 characters) * explanation of the fetcher's functionality. * - * This hook is only called if your module implements hook_aggregator_fetch(). + * This hook is only called if your module implements hook__aggregator_fetch(). * If this hook is not implemented aggregator will use your module's file name * as title and there will be no description. * * @return * An associative array defining a title and a description string. * - * @see hook_aggregator_fetch() + * @see hook__aggregator_fetch() * * @ingroup aggregator */ -function hook_aggregator_fetch_info() { +function hook__aggregator_fetch_info() { return array( 'title' => t('Default fetcher'), 'description' => t('Default fetcher for resources available by URL.'), @@ -94,13 +94,13 @@ function hook_aggregator_fetch_info() { * GUID (string) - RSS/Atom global unique identifier * LINK (string) - the feed item's URL * - * @see hook_aggregator_parse_info() - * @see hook_aggregator_fetch() - * @see hook_aggregator_process() + * @see hook__aggregator_parse_info() + * @see hook__aggregator_fetch() + * @see hook__aggregator_process() * * @ingroup aggregator */ -function hook_aggregator_parse($feed) { +function hook__aggregator_parse($feed) { $feed->items = mymodule_parse($feed->source_string); } @@ -113,18 +113,18 @@ function hook_aggregator_parse($feed) { * as description a brief (40 to 80 characters) explanation of the parser's * functionality. * - * This hook is only called if your module implements hook_aggregator_parse(). + * This hook is only called if your module implements hook__aggregator_parse(). * If this hook is not implemented aggregator will use your module's file name * as title and there will be no description. * * @return * An associative array defining a title and a description string. * - * @see hook_aggregator_parse() + * @see hook__aggregator_parse() * * @ingroup aggregator */ -function hook_aggregator_parse_info() { +function hook__aggregator_parse_info() { return array( 'title' => t('Default parser'), 'description' => t('Default parser for RSS, Atom and RDF feeds.'), @@ -146,17 +146,17 @@ function hook_aggregator_parse_info() { * @param $feed * The $feed object that describes the resource to be processed. $feed->items * contains an array of feed items downloaded and parsed at the parsing - * stage. See hook_aggregator_parse() for the basic format of a single item + * stage. See hook__aggregator_parse() for the basic format of a single item * in the $feed->items array. For the exact format refer to the particular * parser in use. * - * @see hook_aggregator_process_info() - * @see hook_aggregator_fetch() - * @see hook_aggregator_parse() + * @see hook__aggregator_process_info() + * @see hook__aggregator_fetch() + * @see hook__aggregator_parse() * * @ingroup aggregator */ -function hook_aggregator_process($feed) { +function hook__aggregator_process($feed) { foreach ($feed->items as $item) { mymodule_save($item); } @@ -172,17 +172,17 @@ function hook_aggregator_process($feed) { * functionality. * * This hook is only called if your module implements - * hook_aggregator_process(). If this hook is not implemented aggregator + * hook__aggregator_process(). If this hook is not implemented aggregator * will use your module's file name as title and there will be no description. * * @return * An associative array defining a title and a description string. * - * @see hook_aggregator_process() + * @see hook__aggregator_process() * * @ingroup aggregator */ -function hook_aggregator_process_info($feed) { +function hook__aggregator_process_info($feed) { return array( 'title' => t('Default processor'), 'description' => t('Creates lightweight records of feed items.'), @@ -196,7 +196,7 @@ function hook_aggregator_process_info($feed) { * Aggregator calls this hook if either a feed is deleted or a user clicks on * "remove items". * - * If your module stores feed items for example on hook_aggregator_process() it + * If your module stores feed items for example on hook__aggregator_process() it * is recommended to implement this hook and to remove data related to $feed * when called. * @@ -205,7 +205,7 @@ function hook_aggregator_process_info($feed) { * * @ingroup aggregator */ -function hook_aggregator_remove($feed) { +function hook__aggregator_remove($feed) { mymodule_remove_items($feed->fid); } diff --git a/modules/aggregator/aggregator.fetcher.inc b/modules/aggregator/aggregator.fetcher.inc index b936f3a..f886d35 100644 --- a/modules/aggregator/aggregator.fetcher.inc +++ b/modules/aggregator/aggregator.fetcher.inc @@ -7,9 +7,9 @@ */ /** - * Implement hook_aggregator_fetch_info(). + * Implement hook__aggregator_fetch_info(). */ -function aggregator_aggregator_fetch_info() { +function aggregator__aggregator_fetch_info() { return array( 'title' => t('Default fetcher'), 'description' => t('Downloads data from a URL using Drupal\'s HTTP request handler.'), @@ -17,9 +17,9 @@ function aggregator_aggregator_fetch_info() { } /** - * Implement hook_aggregator_fetch(). + * Implement hook__aggregator_fetch(). */ -function aggregator_aggregator_fetch($feed) { +function aggregator__aggregator_fetch($feed) { $feed->source_string = FALSE; // Generate conditional GET headers. diff --git a/modules/aggregator/aggregator.install b/modules/aggregator/aggregator.install index faaa03f..43dc7a5 100644 --- a/modules/aggregator/aggregator.install +++ b/modules/aggregator/aggregator.install @@ -7,17 +7,17 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function aggregator_install() { +function aggregator__install() { // Create tables. drupal_install_schema('aggregator'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function aggregator_uninstall() { +function aggregator__uninstall() { // Remove tables. drupal_uninstall_schema('aggregator'); @@ -32,9 +32,9 @@ function aggregator_uninstall() { } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function aggregator_schema() { +function aggregator__schema() { $schema['aggregator_category'] = array( 'description' => 'Stores categories for aggregator feeds and feed items.', 'fields' => array( diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 7247ffd..4acbf93 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -12,9 +12,9 @@ define('AGGREGATOR_CLEAR_NEVER', 0); /** - * Implement hook_help(). + * Implement hook__help(). */ -function aggregator_help($path, $arg) { +function aggregator__help($path, $arg) { switch ($path) { case 'admin/help#aggregator': $output = '

' . t('The aggregator is a powerful on-site syndicator and news reader that gathers fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '

'; @@ -35,9 +35,9 @@ function aggregator_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function aggregator_theme() { +function aggregator__theme() { return array( 'aggregator_wrapper' => array( 'arguments' => array('content' => NULL), @@ -83,9 +83,9 @@ function aggregator_theme() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function aggregator_menu() { +function aggregator__menu() { $items['admin/settings/aggregator'] = array( 'title' => 'Feed aggregator', 'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.", @@ -253,9 +253,9 @@ function _aggregator_category_title($category) { } /** - * Implement hook_init(). + * Implement hook__init(). */ -function aggregator_init() { +function aggregator__init() { drupal_add_css(drupal_get_path('module', 'aggregator') . '/aggregator.css'); } @@ -270,9 +270,9 @@ function _aggregator_has_categories() { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function aggregator_permission() { +function aggregator__permission() { return array( 'administer news feeds' => array( 'title' => t('Administer news feeds'), @@ -286,11 +286,11 @@ function aggregator_permission() { } /** - * Implement hook_cron(). + * Implement hook__cron(). * * Checks news feeds for updates once their refresh interval has elapsed. */ -function aggregator_cron() { +function aggregator__cron() { $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time AND refresh != :never', array( ':time' => REQUEST_TIME, ':never' => AGGREGATOR_CLEAR_NEVER @@ -301,9 +301,9 @@ function aggregator_cron() { } /** - * Implement hook_block_list(). + * Implement hook__block_list(). */ -function aggregator_block_list() { +function aggregator__block_list() { $block = array(); $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title'); foreach ($result as $category) { @@ -317,9 +317,9 @@ function aggregator_block_list() { } /** - * Implement hook_block_configure(). + * Implement hook__block_configure(). */ -function aggregator_block_configure($delta = '') { +function aggregator__block_configure($delta = '') { list($type, $id) = explode('-', $delta); if ($type == 'category') { $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField(); @@ -334,9 +334,9 @@ function aggregator_block_configure($delta = '') { } /** - * Implement hook_block_save(). + * Implement hook__block_save(). */ -function aggregator_block_save($delta = '', $edit = array()) { +function aggregator__block_save($delta = '', $edit = array()) { list($type, $id) = explode('-', $delta); if ($type == 'category') { db_update('aggregator_category') @@ -347,11 +347,11 @@ function aggregator_block_save($delta = '', $edit = array()) { } /** - * Implement hook_block_view(). + * Implement hook__block_view(). * * Generates blocks for the latest news items in each category and feed. */ -function aggregator_block_view($delta = '') { +function aggregator__block_view($delta = '') { if (user_access('access news feeds')) { $block = array(); list($type, $id) = explode('-', $delta); @@ -514,7 +514,7 @@ function aggregator_save_feed($edit) { * An object describing the feed to be cleared. */ function aggregator_remove($feed) { - // Call hook_aggregator_remove() on all modules. + // Call hook__aggregator_remove() on all modules. module_invoke_all('aggregator_remove', $feed); // Reset feed. db_merge('aggregator_feed') diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc index ffa54e4..133ba09 100644 --- a/modules/aggregator/aggregator.parser.inc +++ b/modules/aggregator/aggregator.parser.inc @@ -7,9 +7,9 @@ */ /** - * Implement hook_aggregator_parse_info(). + * Implement hook__aggregator_parse_info(). */ -function aggregator_aggregator_parse_info() { +function aggregator__aggregator_parse_info() { return array( 'title' => t('Default parser'), 'description' => t('Parses RSS, Atom and RDF feeds.'), @@ -17,9 +17,9 @@ function aggregator_aggregator_parse_info() { } /** - * Implement hook_aggregator_parse(). + * Implement hook__aggregator_parse(). */ -function aggregator_aggregator_parse($feed) { +function aggregator__aggregator_parse($feed) { global $channel, $image; // Filter the input data. diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc index 2c4a786..fa6a568 100644 --- a/modules/aggregator/aggregator.processor.inc +++ b/modules/aggregator/aggregator.processor.inc @@ -7,9 +7,9 @@ */ /** - * Implement hook_aggregator_process_info(). + * Implement hook__aggregator_process_info(). */ -function aggregator_aggregator_process_info() { +function aggregator__aggregator_process_info() { return array( 'title' => t('Default processor'), 'description' => t('Creates lightweight records from feed items.'), @@ -17,9 +17,9 @@ function aggregator_aggregator_process_info() { } /** - * Implement hook_aggregator_process(). + * Implement hook__aggregator_process(). */ -function aggregator_aggregator_process($feed) { +function aggregator__aggregator_process($feed) { if (is_object($feed)) { if (is_array($feed->items)) { foreach ($feed->items as $item) { @@ -45,9 +45,9 @@ function aggregator_aggregator_process($feed) { } /** - * Implement hook_aggregator_remove(). + * Implement hook__aggregator_remove(). */ -function aggregator_aggregator_remove($feed) { +function aggregator__aggregator_remove($feed) { $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchCol(); if ($iids) { db_delete('aggregator_category_item') diff --git a/modules/aggregator/tests/aggregator_test.module b/modules/aggregator/tests/aggregator_test.module index 60501c4..35a94e2 100644 --- a/modules/aggregator/tests/aggregator_test.module +++ b/modules/aggregator/tests/aggregator_test.module @@ -2,9 +2,9 @@ // $Id: aggregator_test.module,v 1.3 2009-05-27 18:33:54 dries Exp $ /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function aggregator_test_menu() { +function aggregator_test__menu() { $items['aggregator/test-feed'] = array( 'title' => 'Test feed static last modified date', 'description' => "A cached test feed with a static last modified date.", diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 1fc4a6a..62aee35 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -7,7 +7,7 @@ */ /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function block_form_system_performance_settings_alter(&$form, &$form_state) { $disabled = count(module_implements('node_grants')); diff --git a/modules/block/block.api.php b/modules/block/block.api.php index 44010a5..2d84e55 100644 --- a/modules/block/block.api.php +++ b/modules/block/block.api.php @@ -52,7 +52,7 @@ * * For a detailed usage example, see block_example.module. */ -function hook_block_list() { +function hook__block_list() { $blocks['exciting'] = array( 'info' => t('An exciting block provided by Mymodule.'), 'weight' => 0, @@ -80,7 +80,7 @@ function hook_block_list() { * Which block to return. This is a descriptive string used to identify * blocks within each module and also within the theme system. * The $delta for each block is defined within the array that your module - * returns when the hook_block_list() implementation is called. + * returns when the hook__block_list() implementation is called. * @return * Optionally return the configuration form. * @@ -89,7 +89,7 @@ function hook_block_list() { * * For a detailed usage example, see block_example.module. */ -function hook_block_configure($delta = '') { +function hook__block_configure($delta = '') { if ($delta == 'exciting') { $form['items'] = array( '#type' => 'select', @@ -112,7 +112,7 @@ function hook_block_configure($delta = '') { * Which block to save the settings for. This is a descriptive string used * to identify blocks within each module and also within the theme system. * The $delta for each block is defined within the array that your module - * returns when the hook_block_list() implementation is called. + * returns when the hook__block_list() implementation is called. * @param $edit * The submitted form data from the configuration form. * @@ -121,7 +121,7 @@ function hook_block_configure($delta = '') { * * For a detailed usage example, see block_example.module. */ -function hook_block_save($delta = '', $edit = array()) { +function hook__block_save($delta = '', $edit = array()) { if ($delta == 'exciting') { variable_set('mymodule_block_items', $edit['items']); } @@ -138,7 +138,7 @@ function hook_block_save($delta = '', $edit = array()) { * Which block to return. This is a descriptive string used to identify * blocks within each module and also within the theme system. * The $delta for each block is defined within the array that your module - * returns when the hook_block_list() implementation is called. + * returns when the hook__block_list() implementation is called. * @return * An array which must define a 'subject' element and a 'content' element * defining the block indexed by $delta. @@ -153,7 +153,7 @@ function hook_block_save($delta = '', $edit = array()) { * * For a detailed usage example, see block_example.module. */ -function hook_block_view($delta = '') { +function hook__block_view($delta = '') { switch ($delta) { case 'exciting': $block = array( @@ -179,7 +179,7 @@ function hook_block_view($delta = '') { * are rendered after the modules have had a chance to manipulate the block * list. * Alternatively you can set $block->content here, which will override the - * content of the block and prevent hook_block_view() from running. + * content of the block and prevent hook__block_view() from running. * * @param $blocks * An array of $blocks, keyed by $bid @@ -187,7 +187,7 @@ function hook_block_view($delta = '') { * This example shows how to achieve language specific visibility setting for * blocks. */ -function hook_block_list_alter(&$blocks) { +function hook__block_list_alter(&$blocks) { global $language, $theme_key; $result = db_query('SELECT module, delta, language FROM {my_table}'); diff --git a/modules/block/block.install b/modules/block/block.install index e493ecc..4978316 100644 --- a/modules/block/block.install +++ b/modules/block/block.install @@ -7,9 +7,9 @@ */ /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function block_schema() { +function block__schema() { $schema['block'] = array( 'description' => 'Stores block settings, such as region and visibility settings.', 'fields' => array( @@ -202,13 +202,13 @@ function block_schema() { } /** - * Implement hook_install(). + * Implement hook__install(). */ -function block_install() { +function block__install() { drupal_install_schema('block'); // Block should go first so that other modules can alter its output - // during hook_page_alter(). Almost everything on the page is a block, + // during hook__page_alter(). Almost everything on the page is a block, // so before block module runs, there will not be much to alter. db_update('system') ->fields(array('weight' => -5)) @@ -217,9 +217,9 @@ function block_install() { } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function block_uninstall() { +function block__uninstall() { drupal_uninstall_schema('block'); } @@ -227,7 +227,7 @@ function block_uninstall() { * Set system.weight to a low value for block module. * * Block should go first so that other modules can alter its output - * during hook_page_alter(). Almost everything on the page is a block, + * during hook__page_alter(). Almost everything on the page is a block, * so before block module runs, there will not be much to alter. */ function block_update_7000() { diff --git a/modules/block/block.module b/modules/block/block.module index ef3d421..f14f559 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -15,7 +15,7 @@ define('BLOCK_REGION_NONE', -1); * Constants defining cache granularity for blocks. * * Modules specify the caching patterns for their blocks using binary - * combinations of these constants in their hook_block_list(): + * combinations of these constants in their hook__block_list(): * $block[delta]['cache'] = BLOCK_CACHE_PER_ROLE | BLOCK_CACHE_PER_PAGE; * BLOCK_CACHE_PER_ROLE is used as a default when no caching pattern is * specified. @@ -61,9 +61,9 @@ define('BLOCK_CACHE_PER_PAGE', 0x0004); define('BLOCK_CACHE_GLOBAL', 0x0008); /** - * Implement hook_help(). + * Implement hook__help(). */ -function block_help($path, $arg) { +function block__help($path, $arg) { switch ($path) { case 'admin/help#block': $output = '

' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '

'; @@ -88,9 +88,9 @@ function block_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function block_theme() { +function block__theme() { return array( 'block' => array( 'arguments' => array('elements' => NULL), @@ -105,9 +105,9 @@ function block_theme() { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function block_permission() { +function block__permission() { return array( 'administer blocks' => array( 'title' => t('Administer blocks'), @@ -117,9 +117,9 @@ function block_permission() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function block_menu() { +function block__menu() { $items['admin/structure/block'] = array( 'title' => 'Blocks', 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', @@ -181,9 +181,9 @@ function _block_themes_access($theme) { } /** - * Implement hook_block_list(). + * Implement hook__block_list(). */ -function block_block_list() { +function block__block_list() { $blocks = array(); $result = db_query('SELECT bid, info FROM {box} ORDER BY info'); @@ -196,9 +196,9 @@ function block_block_list() { } /** - * Implement hook_block_configure(). + * Implement hook__block_configure(). */ -function block_block_configure($delta = 0, $edit = array()) { +function block__block_configure($delta = 0, $edit = array()) { $box = array('format' => FILTER_FORMAT_DEFAULT); if ($delta) { $box = block_box_get($delta); @@ -207,29 +207,29 @@ function block_block_configure($delta = 0, $edit = array()) { } /** - * Implement hook_block_save(). + * Implement hook__block_save(). */ -function block_block_save($delta = 0, $edit = array()) { +function block__block_save($delta = 0, $edit = array()) { block_box_save($edit, $delta); } /** - * Implement hook_block_view(). + * Implement hook__block_view(). * * Generates the administrator-defined blocks for display. */ -function block_block_view($delta = 0, $edit = array()) { +function block__block_view($delta = 0, $edit = array()) { $block = db_query('SELECT body, format FROM {box} WHERE bid = :bid', array(':bid' => $delta))->fetchObject(); $data['content'] = check_markup($block->body, $block->format, '', FALSE); return $data; } /** - * Implement hook_page_alter(). + * Implement hook__page_alter(). * * Render blocks into their regions. */ -function block_page_alter($page) { +function block__page_alter($page) { global $theme; // The theme system might not yet be initialized. We need $theme. @@ -400,7 +400,7 @@ function block_box_form($edit = array()) { '#description' => t('The content of the block as shown to the user.'), '#required' => TRUE, '#weight' => -17, - '#access' => filter_access($edit['format']), + '#access' => filter__access($edit['format']), ); return $form; @@ -419,9 +419,9 @@ function block_box_save($edit, $delta) { } /** - * Implement hook_user_form(). + * Implement hook__user_form(). */ -function block_user_form(&$edit, $account, $category) { +function block__user_form(&$edit, $account, $category) { if ($category == 'account') { $rids = array_keys($account->roles); $result = db_query("SELECT DISTINCT b.* FROM {block} b LEFT JOIN {block_role} r ON b.module = r.module AND b.delta = r.delta WHERE b.status = 1 AND b.custom <> 0 AND (r.rid IN (:rids) OR r.rid IS NULL) ORDER BY b.weight, b.module", array(':rids' => $rids)); @@ -452,9 +452,9 @@ function block_user_form(&$edit, $account, $category) { } /** - * Implement hook_user_validate(). + * Implement hook__user_validate(). */ -function block_user_validate(&$edit, $account, $category) { +function block__user_validate(&$edit, $account, $category) { if (empty($edit['block'])) { $edit['block'] = array(); } @@ -462,7 +462,7 @@ function block_user_validate(&$edit, $account, $category) { } /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function block_form_system_themes_form_alter(&$form, &$form_state) { // This function needs to fire before the theme changes are recorded in the @@ -586,12 +586,12 @@ function _block_load_blocks() { } /** - * Implement hook_block_list_alter(). + * Implement hook__block_list_alter(). * * Check the page, user role, content type and user specific visibilty settings. * Remove the block if the visibility conditions are not met. */ -function block_block_list_alter(&$blocks) { +function block__block_list_alter(&$blocks) { global $user, $theme_key; // Build an array of roles for each block. @@ -805,9 +805,9 @@ function _block_get_cache_id($block) { } /** - * Implement hook_flush_caches(). + * Implement hook__flush_caches(). */ -function block_flush_caches() { +function block__flush_caches() { return array('cache_block'); } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 01c61b2..3d99a4e 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_node_info(). + * Implement hook__node_info(). */ -function blog_node_info() { +function blog__node_info() { return array( 'blog' => array( 'name' => t('Blog entry'), @@ -20,16 +20,16 @@ function blog_node_info() { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function blog_permission() { +function blog__permission() { return node_list_permissions('blog'); } /** - * Implement hook_access(). + * Implement hook__access(). */ -function blog_access($op, $node, $account) { +function blog__access($op, $node, $account) { switch ($op) { case 'create': // Anonymous users cannot post even if they have the permission. @@ -42,9 +42,9 @@ function blog_access($op, $node, $account) { } /** - * Implement hook_user_view(). + * Implement hook__user_view(). */ -function blog_user_view($account) { +function blog__user_view($account) { if (user_access('create blog content', $account)) { $account->content['summary']['blog'] = array( '#type' => 'user_profile_item', @@ -56,9 +56,9 @@ function blog_user_view($account) { } /** - * Implement hook_help(). + * Implement hook__help(). */ -function blog_help($path, $arg) { +function blog__help($path, $arg) { switch ($path) { case 'admin/help#blog': $output = '

' . t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') . '

'; @@ -70,16 +70,16 @@ function blog_help($path, $arg) { } /** - * Implement hook_form(). + * Implement hook__form(). */ -function blog_form($node, $form_state) { - return node_content_form($node, $form_state); +function blog__form($node, $form_state) { + return node_content__form($node, $form_state); } /** - * Implement hook_view(). + * Implement hook__view(). */ -function blog_view($node, $build_mode) { +function blog__view($node, $build_mode) { if ((bool)menu_get_object()) { // Breadcrumb navigation. drupal_set_breadcrumb(array(l(t('Home'), NULL), l(t('Blogs'), 'blog'), l(t("!name's blog", array('!name' => $node->name)), 'blog/' . $node->uid))); @@ -88,9 +88,9 @@ function blog_view($node, $build_mode) { } /** - * Implement hook_node_view(). + * Implement hook__node_view(). */ -function blog_node_view($node, $build_mode = 'full') { +function blog__node_view($node, $build_mode = 'full') { if ($build_mode != 'rss') { if ($node->type == 'blog' && arg(0) != 'blog' || arg(1) != $node->uid) { $links['blog_usernames_blog'] = array( @@ -108,9 +108,9 @@ function blog_node_view($node, $build_mode = 'full') { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function blog_menu() { +function blog__menu() { $items['blog'] = array( 'title' => 'Blogs', 'page callback' => 'blog_page_last', @@ -168,19 +168,19 @@ function _blog_post_exists($account) { } /** - * Implement hook_block_list(). + * Implement hook__block_list(). */ -function blog_block_list() { +function blog__block_list() { $block['recent']['info'] = t('Recent blog posts'); return $block; } /** - * Implement hook_block_view(). + * Implement hook__block_view(). * * Displays the most recent 10 blog titles. */ -function blog_block_view($delta = '') { +function blog__block_view($delta = '') { global $user; if (user_access('access content')) { diff --git a/modules/blogapi/blogapi.install b/modules/blogapi/blogapi.install index b961616..8221106 100644 --- a/modules/blogapi/blogapi.install +++ b/modules/blogapi/blogapi.install @@ -7,26 +7,26 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function blogapi_install() { +function blogapi__install() { // Create tables. drupal_install_schema('blogapi'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function blogapi_uninstall() { +function blogapi__uninstall() { // Remove tables. drupal_uninstall_schema('blogapi'); } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function blogapi_schema() { +function blogapi__schema() { $schema['blogapi_files'] = array( 'description' => 'Stores information for files uploaded via the blogapi.', 'fields' => array( diff --git a/modules/blogapi/blogapi.module b/modules/blogapi/blogapi.module index 17d1542..c234031 100644 --- a/modules/blogapi/blogapi.module +++ b/modules/blogapi/blogapi.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_help(). + * Implement hook__help(). */ -function blogapi_help($path, $arg) { +function blogapi__help($path, $arg) { switch ($path) { case 'admin/help#blogapi': $output = '

' . t("The Blog API module allows your site's users to access and post to their blogs from external blogging clients. External blogging clients are available for a wide range of desktop operating systems, and generally provide a feature-rich graphical environment for creating and editing posts.") . '

'; @@ -21,9 +21,9 @@ function blogapi_help($path, $arg) { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function blogapi_permission() { +function blogapi__permission() { return array( 'administer content with blog api' => array( 'title' => t('Administer content with blog API'), @@ -33,9 +33,9 @@ function blogapi_permission() { } /** - * Implement hook_xmlrpc(). + * Implement hook__xmlrpc(). */ -function blogapi_xmlrpc() { +function blogapi__xmlrpc() { return array( array( 'blogger.getUsersBlogs', @@ -231,7 +231,7 @@ function blogapi_blogger_new_post($appkey, $blogid, $username, $password, $conte return $valid; } - node_validate($edit); + node__validate($edit); if ($errors = form_get_errors()) { return blogapi_error(implode("\n", $errors)); } @@ -289,7 +289,7 @@ function blogapi_blogger_edit_post($appkey, $postid, $username, $password, $cont return $valid; } - node_validate($node); + node__validate($node); if ($errors = form_get_errors()) { return blogapi_error(implode("\n", $errors)); } @@ -357,7 +357,7 @@ function blogapi_blogger_delete_post($appkey, $postid, $username, $password, $pu return blogapi_error($user); } - node_delete($postid); + node__delete($postid); return TRUE; } @@ -808,9 +808,9 @@ function blogapi_admin_settings() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function blogapi_menu() { +function blogapi__menu() { $items['blogapi/rsd'] = array( 'title' => 'RSD', 'page callback' => 'blogapi_rsd', @@ -830,9 +830,9 @@ function blogapi_menu() { } /** - * Implement hook_init(). + * Implement hook__init(). */ -function blogapi_init() { +function blogapi__init() { if (drupal_is_front_page()) { drupal_add_link(array('rel' => 'EditURI', 'type' => 'application/rsd+xml', diff --git a/modules/book/book.install b/modules/book/book.install index 2729cc1..6cb0d7a 100644 --- a/modules/book/book.install +++ b/modules/book/book.install @@ -7,9 +7,9 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function book_install() { +function book__install() { // Create tables. drupal_install_schema('book'); // Add the node type. @@ -17,9 +17,9 @@ function book_install() { } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function book_uninstall() { +function book__uninstall() { // Delete menu links. db_query("DELETE FROM {menu_links} WHERE module = 'book'"); menu_cache_clear_all(); @@ -49,9 +49,9 @@ function _book_install_type_create() { } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function book_schema() { +function book__schema() { $schema['book'] = array( 'description' => 'Stores book outline information. Uniquely connects each node in the outline to a link in {menu_links}', 'fields' => array( diff --git a/modules/book/book.module b/modules/book/book.module index 01c7d04..53cd75a 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function book_theme() { +function book__theme() { return array( 'book_navigation' => array( 'arguments' => array('book_link' => NULL), @@ -37,9 +37,9 @@ function book_theme() { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function book_permission() { +function book__permission() { return array( 'administer book outlines' => array( 'title' => t('Administer book outlines'), @@ -97,9 +97,9 @@ function book_node_view_link($node, $build_mode) { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function book_menu() { +function book__menu() { $items['admin/content/book'] = array( 'title' => 'Books', 'page callback' => 'book_admin_overview', @@ -179,16 +179,16 @@ function _book_outline_remove_access($node) { } /** - * Implement hook_init(). + * Implement hook__init(). */ -function book_init() { +function book__init() { drupal_add_css(drupal_get_path('module', 'book') . '/book.css'); } /** - * Implement hook_field_build_modes(). + * Implement hook__field_build_modes(). */ -function book_field_build_modes($obj_type) { +function book__field_build_modes($obj_type) { $modes = array(); if ($obj_type == 'node') { $modes = array( @@ -199,9 +199,9 @@ function book_field_build_modes($obj_type) { } /** - * Implement hook_block_list(). + * Implement hook__block_list(). */ -function book_block_list() { +function book__block_list() { $block = array(); $block['navigation']['info'] = t('Book navigation'); $block['navigation']['cache'] = BLOCK_CACHE_PER_PAGE | BLOCK_CACHE_PER_ROLE; @@ -210,12 +210,12 @@ function book_block_list() { } /** - * Implement hook_block_view(). + * Implement hook__block_view(). * * Displays the book table of contents in a block when the current page is a * single-node view of a book node. */ -function book_block_view($delta = '') { +function book__block_view($delta = '') { $block = array(); $current_bid = 0; if ($node = menu_get_object()) { @@ -263,9 +263,9 @@ function book_block_view($delta = '') { } /** - * Implement hook_block_configure(). + * Implement hook__block_configure(). */ -function book_block_configure($delta = '') { +function book__block_configure($delta = '') { $block = array(); $options = array( 'all pages' => t('Show block on all pages'), @@ -283,9 +283,9 @@ function book_block_configure($delta = '') { } /** - * Implement hook_block_save(). + * Implement hook__block_save(). */ -function book_block_save($delta = '', $edit = array()) { +function book__block_save($delta = '', $edit = array()) { $block = array(); variable_set('book_block_mode', $edit['book_block_mode']); } @@ -340,14 +340,14 @@ function book_get_books() { } /** - * Implement hook_form_alter(). + * Implement hook__form_alter(). * * Adds the book fieldset to the node form. * * @see book_pick_book_submit() * @see book_submit() */ -function book_form_alter(&$form, $form_state, $form_id) { +function book__form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { // Add elements to the node form. @@ -704,9 +704,9 @@ function book_menu_name($bid) { } /** - * Implement hook_node_load(). + * Implement hook__node_load(). */ -function book_node_load($nodes, $types) { +function book__node_load($nodes, $types) { $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (:nids)", array(':nids' => array_keys($nodes)), array('fetch' => PDO::FETCH_ASSOC)); foreach ($result as $record) { $nodes[$record['nid']]->book = $record; @@ -717,9 +717,9 @@ function book_node_load($nodes, $types) { } /** - * Implement hook_node_view(). + * Implement hook__node_view(). */ -function book_node_view($node, $build_mode) { +function book__node_view($node, $build_mode) { if ($build_mode == 'full') { if (!empty($node->book['bid']) && empty($node->in_preview)) { $node->content['book_navigation'] = array( @@ -735,12 +735,12 @@ function book_node_view($node, $build_mode) { } /** - * Implement hook_page_alter(). + * Implement hook__page_alter(). * * Add the book menu to the list of menus used to build the active trail when * viewing a book page. */ -function book_page_alter(&$page) { +function book__page_alter(&$page) { if (($node = menu_get_object()) && !empty($node->book['bid'])) { $active_menus = menu_get_active_menu_names(); $active_menus[] = $node->book['menu_name']; @@ -749,9 +749,9 @@ function book_page_alter(&$page) { } /** - * Implement hook_node_presave(). + * Implement hook__node_presave(). */ -function book_node_presave($node) { +function book__node_presave($node) { // Always save a revision for non-administrators. if (!empty($node->book['bid']) && !user_access('administer nodes')) { $node->revision = 1; @@ -767,9 +767,9 @@ function book_node_presave($node) { } /** - * Implement hook_node_insert(). + * Implement hook__node_insert(). */ -function book_node_insert($node) { +function book__node_insert($node) { if (!empty($node->book['bid'])) { if ($node->book['bid'] == 'new') { // New nodes that are their own book. @@ -782,9 +782,9 @@ function book_node_insert($node) { } /** - * Implement hook_node_update(). + * Implement hook__node_update(). */ -function book_node_update($node) { +function book__node_update($node) { if (!empty($node->book['bid'])) { if ($node->book['bid'] == 'new') { // New nodes that are their own book. @@ -797,9 +797,9 @@ function book_node_update($node) { } /** - * Implement hook_node_delete(). + * Implement hook__node_delete(). */ -function book_node_delete($node) { +function book__node_delete($node) { if (!empty($node->book['bid'])) { if ($node->nid == $node->book['bid']) { // Handle deletion of a top-level post. @@ -820,9 +820,9 @@ function book_node_delete($node) { } /** - * Implement hook_node_prepare(). + * Implement hook__node_prepare(). */ -function book_node_prepare($node) { +function book__node_prepare($node) { // Prepare defaults for the add/edit form. if (empty($node->book) && (user_access('add content to books') || user_access('administer book outlines'))) { $node->book = array(); @@ -1078,12 +1078,12 @@ function book_type_is_allowed($type) { } /** - * Implement hook_node_type_update(). + * Implement hook__node_type_update(). * * Update book module's persistent variables if the machine-readable name of a * node type is changed. */ -function book_node_type_update($type) { +function book__node_type_update($type) { if (!empty($type->old_type) && $type->old_type != $type->type) { // Update the list of node types that are allowed to be added to books. $allowed_types = variable_get('book_allowed_types', array('book')); @@ -1103,9 +1103,9 @@ function book_node_type_update($type) { } /** - * Implement hook_help(). + * Implement hook__help(). */ -function book_help($path, $arg) { +function book__help($path, $arg) { switch ($path) { case 'admin/help#book': $output = '

' . t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') . '

'; diff --git a/modules/color/color.install b/modules/color/color.install index f05709c..4b014a2 100644 --- a/modules/color/color.install +++ b/modules/color/color.install @@ -6,7 +6,7 @@ * Install, update and uninstall functions for the color module. */ -function color_requirements($phase) { +function color__requirements($phase) { $requirements = array(); if ($phase == 'runtime') { diff --git a/modules/color/color.module b/modules/color/color.module index 24078ee..8849a1f 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -2,9 +2,9 @@ // $Id: color.module,v 1.64 2009-08-05 19:40:55 webchick Exp $ /** - * Implement hook_help(). + * Implement hook__help(). */ -function color_help($path, $arg) { +function color__help($path, $arg) { switch ($path) { case 'admin/help#color': $output = '

' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/settings/file-system'))) . '

'; @@ -17,9 +17,9 @@ function color_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function color_theme() { +function color__theme() { return array( 'color_scheme_form' => array( 'arguments' => array('form' => NULL), @@ -28,7 +28,7 @@ function color_theme() { } /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function color_form_system_theme_settings_alter(&$form, &$form_state) { if (color_get_info(arg(4)) && function_exists('gd_info')) { @@ -52,14 +52,14 @@ function color_form_system_theme_settings_alter(&$form, &$form_state) { } /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function color_form_system_themes_alter(&$form, &$form_state) { _color_theme_select_form_alter($form, $form_state); } /** - * Helper for hook_form_FORM_ID_alter() implementations. + * Helper for hook__form_FORM_ID_alter() implementations. */ function _color_theme_select_form_alter(&$form, &$form_state) { // Use the generated screenshot in the theme list. diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc index dd2e7c2..6504ef6 100644 --- a/modules/comment/comment.admin.inc +++ b/modules/comment/comment.admin.inc @@ -251,7 +251,7 @@ function comment_confirm_delete(&$form_state, $comment) { function comment_confirm_delete_submit($form, &$form_state) { $comment = $form['#comment']; // Delete the comment and its replies. - comment_delete($comment->cid); + comment__delete($comment->cid); drupal_set_message(t('The comment and all its replies have been deleted.')); watchdog('content', t('Deleted comment @cid and its replies.', array('@cid' => $comment->cid))); // Clear the cache so an anonymous user sees that his comment was deleted. diff --git a/modules/comment/comment.api.php b/modules/comment/comment.api.php index c088ad3..e358d8f 100644 --- a/modules/comment/comment.api.php +++ b/modules/comment/comment.api.php @@ -17,7 +17,7 @@ * @param $comment * The comment object. */ -function hook_comment_insert($comment) { +function hook__comment_insert($comment) { // Reindex the node when comments are added. search_touch_node($comment->nid); } @@ -28,7 +28,7 @@ function hook_comment_insert($comment) { * @param $comment * The comment object. */ -function hook_comment_update($comment) { +function hook__comment_update($comment) { // Reindex the node when comments are updated. search_touch_node($comment->nid); } @@ -39,7 +39,7 @@ function hook_comment_update($comment) { * @param $comments * An array of comment objects indexed by cid. */ -function hook_comment_load($comments) { +function hook__comment_load($comments) { $result = db_query('SELECT cid, foo FROM {mytable} WHERE cid IN (:cids)', array(':cids' => array_keys($comments))); foreach ($result as $record) { $comments[$record->cid]->foo = $record->foo; @@ -54,7 +54,7 @@ function hook_comment_load($comments) { * @return * Nothing. */ -function hook_comment_view($comment) { +function hook__comment_view($comment) { // how old is the comment $comment->time_ago = time() - $comment->timestamp; } @@ -67,7 +67,7 @@ function hook_comment_view($comment) { * @return * Nothing. */ -function hook_comment_publish($comment) { +function hook__comment_publish($comment) { drupal_set_message(t('Comment: @subject has been published', array('@subject' => $comment->subject))); } @@ -79,7 +79,7 @@ function hook_comment_publish($comment) { * @return * Nothing. */ -function hook_comment_unpublish($comment) { +function hook__comment_unpublish($comment) { drupal_set_message(t('Comment: @subject has been unpublished', array('@subject' => $comment->subject))); } @@ -91,7 +91,7 @@ function hook_comment_unpublish($comment) { * @return * Nothing. */ -function hook_comment_delete($comment) { +function hook__comment_delete($comment) { drupal_set_message(t('Comment: @subject has been deleted', array('@subject' => $comment->subject))); } diff --git a/modules/comment/comment.install b/modules/comment/comment.install index 9d1ecb9..921c3aa 100644 --- a/modules/comment/comment.install +++ b/modules/comment/comment.install @@ -7,17 +7,17 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function comment_install() { +function comment__install() { // Create tables. drupal_install_schema('comment'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function comment_uninstall() { +function comment__uninstall() { // Remove tables. drupal_uninstall_schema('comment'); @@ -38,9 +38,9 @@ function comment_uninstall() { } /** - * Implement hook_enable(). + * Implement hook__enable(). */ -function comment_enable() { +function comment__enable() { // Insert records into the node_comment_statistics for nodes that are missing. $query = db_select('node', 'n'); $query->leftJoin('node_comment_statistics', 'ncs', 'ncs.nid = n.nid'); @@ -165,9 +165,9 @@ function comment_update_7006() { */ /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function comment_schema() { +function comment__schema() { $schema['comment'] = array( 'description' => 'Stores comments and associated data.', 'fields' => array( diff --git a/modules/comment/comment.module b/modules/comment/comment.module index eb6e940..1fa3faf 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -81,9 +81,9 @@ define('COMMENT_PREVIEW_OPTIONAL', 0); define('COMMENT_PREVIEW_REQUIRED', 1); /** - * Implement hook_help(). + * Implement hook__help(). */ -function comment_help($path, $arg) { +function comment__help($path, $arg) { switch ($path) { case 'admin/help#comment': $output = '

' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Open to allow comments, Hidden to hide existing comments and prevent new comments or Closed to allow existing comments to be viewed but no new comments added. Comment display settings and other controls may also be customized for each content type.', array('@content-type' => url('admin/structure/types'))) . '

'; @@ -96,9 +96,9 @@ function comment_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function comment_theme() { +function comment__theme() { return array( 'comment_block' => array( 'arguments' => array(), @@ -124,9 +124,9 @@ function comment_theme() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function comment_menu() { +function comment__menu() { $items['admin/content/comment'] = array( 'title' => 'Comments', 'description' => 'List and edit site comments and the comment approval queue.', @@ -187,9 +187,9 @@ function comment_menu() { } /** - * Implement hook_fieldable_info(). + * Implement hook__fieldable_info(). */ -function comment_fieldable_info() { +function comment__fieldable_info() { $return = array( 'comment' => array( 'label' => t('Comment'), @@ -212,25 +212,25 @@ function comment_fieldable_info() { } /** - * Implement hook_node_type_insert(). + * Implement hook__node_type_insert(). */ -function comment_node_type_insert($info) { +function comment__node_type_insert($info) { field_attach_create_bundle('comment_node_' . $info->type); } /** - * Implement hook_node_type_update(). + * Implement hook__node_type_update(). */ -function comment_node_type_update($info) { +function comment__node_type_update($info) { if (!empty($info->old_type) && $info->type != $info->old_type) { field_attach_rename_bundle('comment_node_' . $info->old_type, 'comment_node_' . $info->type); } } /** - * Implement hook_node_type_delete(). + * Implement hook__node_type_delete(). */ -function comment_node_type_delete($info) { +function comment__node_type_delete($info) { field_attach_delete_bundle('comment_node_' . $info->type); $settings = array( 'comment', @@ -247,9 +247,9 @@ function comment_node_type_delete($info) { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function comment_permission() { +function comment__permission() { return array( 'administer comments' => array( 'title' => t('Administer comments'), @@ -271,18 +271,18 @@ function comment_permission() { } /** - * Implement hook_block_list(). + * Implement hook__block_list(). */ -function comment_block_list() { +function comment__block_list() { $blocks['recent']['info'] = t('Recent comments'); return $blocks; } /** - * Implement hook_block_configure(). + * Implement hook__block_configure(). */ -function comment_block_configure($delta = '') { +function comment__block_configure($delta = '') { $form['comment_block_count'] = array( '#type' => 'select', '#title' => t('Number of recent comments'), @@ -294,18 +294,18 @@ function comment_block_configure($delta = '') { } /** - * Implement hook_block_save(). + * Implement hook__block_save(). */ -function comment_block_save($delta = '', $edit = array()) { +function comment__block_save($delta = '', $edit = array()) { variable_set('comment_block_count', (int)$edit['comment_block_count']); } /** - * Implement hook_block_view(). + * Implement hook__block_view(). * * Generates a block with the most recent comments. */ -function comment_block_view($delta = '') { +function comment__block_view($delta = '') { if (user_access('access comments')) { $block['subject'] = t('Recent comments'); $block['content'] = theme('comment_block'); @@ -464,9 +464,9 @@ function theme_comment_block() { } /** - * Implement hook_node_view(). + * Implement hook__node_view(). */ -function comment_node_view($node, $build_mode) { +function comment__node_view($node, $build_mode) { $links = array(); if ($node->comment) { @@ -877,7 +877,7 @@ function comment_links($comment) { } } elseif (user_access('post comments')) { - if (comment_access('edit', $comment)) { + if (comment__access('edit', $comment)) { $links['comment_edit'] = array( 'title' => t('edit'), 'href' => "comment/edit/$comment->cid", @@ -923,7 +923,7 @@ function comment_build_multiple($comments, $build_mode = 'full', $weight = 0) { } /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function comment_form_node_type_form_alter(&$form, $form_state) { if (isset($form['identity']['type'])) { @@ -985,9 +985,9 @@ function comment_form_node_type_form_alter(&$form, $form_state) { } /** - * Implement hook_form_alter(). + * Implement hook__form_alter(). */ -function comment_form_alter(&$form, $form_state, $form_id) { +function comment__form_alter(&$form, $form_state, $form_id) { if (!empty($form['#node_edit_form'])) { $node = $form['#node']; $form['comment_settings'] = array( @@ -1050,9 +1050,9 @@ function comment_form_alter(&$form, $form_state, $form_id) { } /** - * Implement hook_node_load(). + * Implement hook__node_load(). */ -function comment_node_load($nodes, $types) { +function comment__node_load($nodes, $types) { $comments_enabled = array(); // Check if comments are enabled for each node. If comments are disabled, @@ -1081,18 +1081,18 @@ function comment_node_load($nodes, $types) { } /** - * Implement hook_node_prepare(). + * Implement hook__node_prepare(). */ -function comment_node_prepare($node) { +function comment__node_prepare($node) { if (!isset($node->comment)) { $node->comment = variable_get("comment_$node->type", COMMENT_NODE_OPEN); } } /** - * Implement hook_node_insert(). + * Implement hook__node_insert(). */ -function comment_node_insert($node) { +function comment__node_insert($node) { db_insert('node_comment_statistics') ->fields(array( 'nid' => $node->nid, @@ -1105,9 +1105,9 @@ function comment_node_insert($node) { } /** - * Implement hook_node_delete(). + * Implement hook__node_delete(). */ -function comment_node_delete($node) { +function comment__node_delete($node) { $cids = db_query('SELECT cid FROM {comment} WHERE nid = :nid', array(':nid' => $node->nid))->fetchCol(); comment_delete_multiple($cids); db_delete('node_comment_statistics') @@ -1116,9 +1116,9 @@ function comment_node_delete($node) { } /** - * Implement hook_node_update_index(). + * Implement hook__node_update_index(). */ -function comment_node_update_index($node) { +function comment__node_update_index($node) { $text = ''; if ($node->comment != COMMENT_NODE_HIDDEN) { $comments = db_query('SELECT subject, comment, format FROM {comment} WHERE nid = :nid AND status = :status', array( @@ -1133,17 +1133,17 @@ function comment_node_update_index($node) { } /** - * Implement hook_update_index(). + * Implement hook__update_index(). */ -function comment_update_index() { +function comment__update_index() { // Store the maximum possible comments per thread (used for ranking by reply count) variable_set('node_cron_comments_scale', 1.0 / max(1, db_query('SELECT MAX(comment_count) FROM {node_comment_statistics}')->fetchField())); } /** - * Implement hook_node_search_result(). + * Implement hook__node_search_result(). */ -function comment_node_search_result($node) { +function comment__node_search_result($node) { if ($node->comment != COMMENT_NODE_HIDDEN) { $comments = db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid', array('nid' => $node->nid))->fetchField(); return format_plural($comments, '1 comment', '@count comments'); @@ -1152,9 +1152,9 @@ function comment_node_search_result($node) { } /** - * Implement hook_user_cancel(). + * Implement hook__user_cancel(). */ -function comment_user_cancel($edit, $account, $method) { +function comment__user_cancel($edit, $account, $method) { switch ($method) { case 'user_cancel_block_unpublish': db_update('comment') @@ -1187,7 +1187,7 @@ function comment_user_cancel($edit, $account, $method) { } /** - * This is *not* a hook_access() implementation. This function is called + * This is *not* a hook__access() implementation. This function is called * to determine whether the current user has access to a particular comment. * * Authenticated users can edit their comments as long they have not been @@ -1201,7 +1201,7 @@ function comment_user_cancel($edit, $account, $method) { * @return * TRUE if the current user has acces to the comment, FALSE otherwise. */ -function comment_access($op, $comment) { +function comment__access($op, $comment) { global $user; if ($op == 'edit') { @@ -1353,7 +1353,7 @@ function comment_save($comment) { * @param $cid * The comment to delete. */ -function comment_delete($cid) { +function comment__delete($cid) { comment_delete_multiple(array($cid)); } @@ -1465,7 +1465,7 @@ function comment_load_multiple($cids = array(), $conditions = array()) { if (!empty($comments)) { // Attach fields. field_attach_load('comment', $comments); - // Invoke hook_comment_load(). + // Invoke hook__comment_load(). module_invoke_all('comment_load', $comments); } return $comments; @@ -2298,9 +2298,9 @@ function vancode2int($c = '00') { } /** - * Implement hook_hook_info(). + * Implement hook__hook_info(). */ -function comment_hook_info() { +function comment__hook_info() { return array( 'comment' => array( 'comment' => array( @@ -2322,9 +2322,9 @@ function comment_hook_info() { } /** - * Implement hook_action_info(). + * Implement hook__action_info(). */ -function comment_action_info() { +function comment__action_info() { return array( 'comment_unpublish_action' => array( 'description' => t('Unpublish comment'), @@ -2418,9 +2418,9 @@ function comment_unpublish_by_keyword_action($comment, $context) { } /** - * Implement hook_ranking(). + * Implement hook__ranking(). */ -function comment_ranking() { +function comment__ranking() { return array( 'comments' => array( 'title' => t('Number of comments'), @@ -2433,9 +2433,9 @@ function comment_ranking() { } /** - * Implement hook_menu_alter(). + * Implement hook__menu_alter(). */ -function comment_menu_alter(&$items) { +function comment__menu_alter(&$items) { // Add comments to the description for admin/content. $items['admin/content/content']['description'] = "View, edit, and delete your site's content and comments."; } diff --git a/modules/contact/contact.install b/modules/contact/contact.install index c00282a..6a43609 100644 --- a/modules/contact/contact.install +++ b/modules/contact/contact.install @@ -7,17 +7,17 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function contact_install() { +function contact__install() { // Create tables. drupal_install_schema('contact'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function contact_uninstall() { +function contact__uninstall() { // Remove tables. drupal_uninstall_schema('contact'); @@ -27,9 +27,9 @@ function contact_uninstall() { } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function contact_schema() { +function contact__schema() { $schema['contact'] = array( 'description' => 'Contact form category settings.', 'fields' => array( diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 060f919..e92d585 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_help(). + * Implement hook__help(). */ -function contact_help($path, $arg) { +function contact__help($path, $arg) { switch ($path) { case 'admin/help#contact': $output = '

' . t('The contact module facilitates communication via e-mail, by allowing your site\'s visitors to contact one another (personal contact forms), and by providing a simple way to direct messages to a set of administrator-defined recipients (the contact page). With either form, users specify a subject, write their message, and (optionally) have a copy of their message sent to their own e-mail address.', array('@contact' => url('contact'))) . '

'; @@ -33,9 +33,9 @@ function contact_help($path, $arg) { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function contact_permission() { +function contact__permission() { return array( 'administer site-wide contact form' => array( 'title' => t('Administer site-wide contact form'), @@ -49,9 +49,9 @@ function contact_permission() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function contact_menu() { +function contact__menu() { $items['admin/structure/contact'] = array( 'title' => 'Contact form', 'description' => 'Create a system contact form and set up categories for the form to use.', @@ -129,16 +129,16 @@ function _contact_personal_tab_access($account) { /** * Load the data for a single contact category. */ -function contact_load($cid) { +function contact__load($cid) { $contact = db_query("SELECT cid, category, recipients, reply, weight, selected FROM {contact} WHERE cid = :cid", array(':cid' => $cid)) ->fetchAssoc(); return empty($contact) ? FALSE : $contact; } /** - * Implement hook_user_form(). + * Implement hook__user_form(). */ -function contact_user_form(&$edit, $account, $category) { +function contact__user_form(&$edit, $account, $category) { if ($category == 'account') { $form['contact'] = array('#type' => 'fieldset', '#title' => t('Contact settings'), @@ -155,16 +155,16 @@ function contact_user_form(&$edit, $account, $category) { } /** - * Implement hook_user_insert(). + * Implement hook__user_insert(). */ -function contact_user_insert(&$edit, $account, $category) { +function contact__user_insert(&$edit, $account, $category) { $edit['contact'] = variable_get('contact_default_status', 1); } /** - * Implement hook_mail(). + * Implement hook__mail(). */ -function contact_mail($key, &$message, $params) { +function contact__mail($key, &$message, $params) { $language = $message['language']; switch ($key) { case 'page_mail': diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc index f9b0e31..dad320a 100644 --- a/modules/contact/contact.pages.inc +++ b/modules/contact/contact.pages.inc @@ -123,7 +123,7 @@ function contact_site_form_submit($form, &$form_state) { $from = $values['mail']; // Load category properties and save form values for email composition. - $contact = contact_load($values['cid']); + $contact = contact__load($values['cid']); $values['contact'] = $contact; // Send the e-mail to the recipients using the site default language. diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc index 4193cd4..1407678 100644 --- a/modules/dblog/dblog.admin.inc +++ b/modules/dblog/dblog.admin.inc @@ -7,7 +7,7 @@ */ /** - * Implement hook_form_FORM_ID_alter(). + * Implement hook__form_FORM_ID_alter(). */ function dblog_form_system_logging_settings_alter(&$form, $form_state) { $form['dblog_row_limit'] = array( diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install index 1eb3cbd..42b9032 100644 --- a/modules/dblog/dblog.install +++ b/modules/dblog/dblog.install @@ -7,25 +7,25 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function dblog_install() { +function dblog__install() { // Create tables. drupal_install_schema('dblog'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function dblog_uninstall() { +function dblog__uninstall() { // Remove tables. drupal_uninstall_schema('dblog'); } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function dblog_schema() { +function dblog__schema() { $schema['watchdog'] = array( 'description' => 'Table that contains logs of all system events.', 'fields' => array( diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module index c2a15d9..04d16d0 100644 --- a/modules/dblog/dblog.module +++ b/modules/dblog/dblog.module @@ -13,9 +13,9 @@ */ /** - * Implement hook_help(). + * Implement hook__help(). */ -function dblog_help($path, $arg) { +function dblog__help($path, $arg) { switch ($path) { case 'admin/help#dblog': $output = '

' . t('The dblog module monitors your system, capturing system events in a log to be reviewed by an authorized individual at a later time. This is useful for site administrators who want a quick overview of activities on their site. The logs also record the sequence of events, so it can be useful for debugging site errors.') . '

'; @@ -28,9 +28,9 @@ function dblog_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function dblog_theme() { +function dblog__theme() { return array( 'dblog_filters' => array( 'arguments' => array('form' => NULL), @@ -39,9 +39,9 @@ function dblog_theme() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function dblog_menu() { +function dblog__menu() { $items['admin/reports/dblog'] = array( 'title' => 'Recent log entries', 'description' => 'View events that have recently been logged.', @@ -73,7 +73,7 @@ function dblog_menu() { return $items; } -function dblog_init() { +function dblog__init() { if (arg(0) == 'admin' && arg(1) == 'reports') { // Add the CSS for this module drupal_add_css(drupal_get_path('module', 'dblog') . '/dblog.css', array('preprocess' => FALSE)); @@ -83,11 +83,11 @@ function dblog_init() { /** - * Implement hook_cron(). + * Implement hook__cron(). * * Remove expired log messages and flood control events. */ -function dblog_cron() { +function dblog__cron() { // Cleanup the watchdog table $max = db_query('SELECT MAX(wid) FROM {watchdog}')->fetchField(); db_delete('watchdog') @@ -96,9 +96,9 @@ function dblog_cron() { } /** - * Implement hook_user_cancel(). + * Implement hook__user_cancel(). */ -function dblog_user_cancel($edit, $account, $method) { +function dblog__user_cancel($edit, $account, $method) { switch ($method) { case 'user_cancel_reassign': db_update('watchdog') @@ -127,11 +127,11 @@ function _dblog_get_message_types() { } /** - * Implement hook_watchdog(). + * Implement hook__watchdog(). * * Note some values may be truncated for database column size restrictions. */ -function dblog_watchdog(array $log_entry) { +function dblog__watchdog(array $log_entry) { Database::getConnection('default', 'default')->insert('watchdog') ->fields(array( 'uid' => $log_entry['user']->uid, diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test index 06442a0..97c602c 100644 --- a/modules/dblog/dblog.test +++ b/modules/dblog/dblog.test @@ -106,7 +106,7 @@ class DBLogTestCase extends DrupalWebTestCase { $message = 'Log entry added to test the dblog row limit.'; for ($i = 0; $i < $count; $i++) { $log['message'] = $i . ' => ' . $message; - dblog_watchdog($log); + dblog__watchdog($log); } } @@ -378,9 +378,9 @@ class DBLogTestCase extends DrupalWebTestCase { 'timestamp' => REQUEST_TIME, ); // Add a watchdog entry. - dblog_watchdog($log); + dblog__watchdog($log); // Make sure the table count has actually incremented. - $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), t('dblog_watchdog() added an entry to the dblog :count', array(':count' => $count))); + $this->assertEqual($count + 1, db_query('SELECT COUNT(*) FROM {watchdog}')->fetchField(), t('dblog__watchdog() added an entry to the dblog :count', array(':count' => $count))); // Login the admin user. $this->drupalLogin($this->big_user); // Now post to clear the db table. diff --git a/modules/field/field.api.php b/modules/field/field.api.php index c0231cd..454c4dd 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -10,7 +10,7 @@ * Expose fieldable object types. * * Inform the Field API about object types to which fields can be attached. - * @see hook_fieldable_info_alter(). + * @see hook__fieldable_info_alter(). * * @return * An array whose keys are fieldable object type names and whose values are @@ -49,17 +49,17 @@ * implemented in a contributed module) to attach themselves to the * existing administration pages for the bundle. * - path: the path of the bundle's main administration page, as defined - * in hook_menu(). If the path includes a placeholder for the bundle, + * in hook__menu(). If the path includes a placeholder for the bundle, * the 'bundle argument', 'bundle helper' and 'real path' keys below * are required. * - bundle argument: The position of the placeholder in 'path', if any. * - real path: The actual path (no placeholder) of the bundle's main * administration page. This will be used to generate links. - * - access callback: As in hook_menu(). 'user_access' will be assumed if + * - access callback: As in hook__menu(). 'user_access' will be assumed if * no value is provided. - * - access arguments: As in hook_menu(). + * - access arguments: As in hook__menu(). */ -function hook_fieldable_info() { +function hook__fieldable_info() { $return = array( 'taxonomy_term' => array( 'label' => t('Taxonomy term'), @@ -91,10 +91,10 @@ function hook_fieldable_info() { * Perform alterations on fieldable types. * * @param $info - * Array of informations on fieldable types exposed by hook_fieldable_info() + * Array of informations on fieldable types exposed by hook__fieldable_info() * implementations. */ -function hook_fieldable_info_alter(&$info) { +function hook__fieldable_info_alter(&$info) { // A contributed module handling node-level caching would want to disable // field cache for nodes. $info['node']['cacheable'] = FALSE; @@ -111,28 +111,28 @@ function hook_fieldable_info_alter(&$info) { * * The bulk of the Field Types API are related to field types. A field type * represents a particular data storage type (integer, string, date, etc.) that - * can be attached to a fieldable object. hook_field_info() defines the basic + * can be attached to a fieldable object. hook__field_info() defines the basic * properties of a field type, and a variety of other field hooks are called by * the Field Attach API to perform field-type-specific actions. - * @see hook_field_info(). - * @see hook_field_info_alter(). - * @see hook_field_schema(). - * @see hook_field_load(). - * @see hook_field_validate(). - * @see hook_field_presave(). - * @see hook_field_insert(). - * @see hook_field_update(). - * @see hook_field_delete(). - * @see hook_field_delete_revision(). - * @see hook_field_sanitize(). + * @see hook__field_info(). + * @see hook__field_info_alter(). + * @see hook__field_schema(). + * @see hook__field_load(). + * @see hook__field_validate(). + * @see hook__field_presave(). + * @see hook__field_insert(). + * @see hook__field_update(). + * @see hook__field_delete(). + * @see hook__field_delete_revision(). + * @see hook__field_sanitize(). * * The Field Types API also defines two kinds of pluggable handlers: widgets * and formatters, which specify how the field appears in edit forms and in * displayed objects. Widgets and formatters can be implemented by a field-type * module for it's own field types, or by a third-party module to extend the * behavior of existing field types. - * @see hook_field_widget_info(). - * @see hook_field_formatter_info(). + * @see hook__field_widget_info(). + * @see hook__field_formatter_info(). */ /** @@ -166,7 +166,7 @@ function hook_fieldable_info_alter(&$info) { * type is available (i.e. provided by the field type module, or by a module * the field type module depends on). */ -function hook_field_info() { +function hook__field_info() { return array( 'text' => array( 'label' => t('Text'), @@ -199,10 +199,10 @@ function hook_field_info() { * Perform alterations on Field API field types. * * @param $info - * Array of informations on widget types exposed by hook_field_info() + * Array of informations on widget types exposed by hook__field_info() * implementations. */ -function hook_field_info_alter(&$info) { +function hook__field_info_alter(&$info) { // Add a setting to all field types. foreach ($info as $field_type => $field_type_info) { $info[$field_type]['settings'] += array( @@ -239,7 +239,7 @@ function hook_field_info_alter(&$info) { * risk, modify the default indexes specified by the field-type module. * Some storage engines might not support indexes. */ -function hook_field_schema($field) { +function hook__field_schema($field) { if ($field['type'] == 'text_long') { $columns = array( 'value' => array( @@ -301,14 +301,14 @@ function hook_field_schema($field) { * Changes or additions to field values are done by altering the $items * parameter by reference. */ -function hook_field_load($obj_type, $objects, $field, $instances, &$items, $age) { +function hook__field_load($obj_type, $objects, $field, $instances, &$items, $age) { global $language; foreach ($objects as $id => $object) { foreach ($items[$id] as $delta => $item) { if (!empty($instances[$id]['settings']['text_processing'])) { // Only process items with a cacheable format, the rest will be - // handled by hook_field_sanitize(). + // handled by hook__field_sanitize(). $format = $item['format']; if (filter_format_allowcache($format)) { $lang = isset($object->language) ? $object->language : $language->language; @@ -346,11 +346,11 @@ function hook_field_load($obj_type, $objects, $field, $instances, &$items, $age) * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_sanitize($obj_type, $object, $field, $instance, $items) { +function hook__field_sanitize($obj_type, $object, $field, $instance, $items) { global $language; foreach ($items as $delta => $item) { // Only sanitize items which were not already processed inside - // hook_field_load(), i.e. items with uncacheable text formats, or coming + // hook__field_load(), i.e. items with uncacheable text formats, or coming // from a form preview. if (!isset($items[$delta]['safe'])) { if (!empty($instance['settings']['text_processing'])) { @@ -396,7 +396,7 @@ function hook_field_sanitize($obj_type, $object, $field, $instance, $items) { * - 'error': an error code (should be a string, prefixed with the module name) * - 'message': the human readable message to be displayed. */ -function hook_field_validate($obj_type, $object, $field, $instance, $items, &$errors) { +function hook__field_validate($obj_type, $object, $field, $instance, $items, &$errors) { foreach ($items as $delta => $item) { if (!empty($item['value'])) { if (!empty($field['settings']['max_length']) && drupal_strlen($item['value']) > $field['settings']['max_length']) { @@ -423,7 +423,7 @@ function hook_field_validate($obj_type, $object, $field, $instance, $items, &$er * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_presave($obj_type, $object, $field, $instance, $items) { +function hook__field_presave($obj_type, $object, $field, $instance, $items) { } /** @@ -440,7 +440,7 @@ function hook_field_presave($obj_type, $object, $field, $instance, $items) { * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_insert($obj_type, $object, $field, $instance, $items) { +function hook__field_insert($obj_type, $object, $field, $instance, $items) { } /** @@ -457,7 +457,7 @@ function hook_field_insert($obj_type, $object, $field, $instance, $items) { * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_update($obj_type, $object, $field, $instance, $items) { +function hook__field_update($obj_type, $object, $field, $instance, $items) { } /** @@ -476,7 +476,7 @@ function hook_field_update($obj_type, $object, $field, $instance, $items) { * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_delete($obj_type, $object, $field, $instance, $items) { +function hook__field_delete($obj_type, $object, $field, $instance, $items) { } /** @@ -496,7 +496,7 @@ function hook_field_delete($obj_type, $object, $field, $instance, $items) { * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_delete_revision($obj_type, $object, $field, $instance, $items) { +function hook__field_delete_revision($obj_type, $object, $field, $instance, $items) { } /** @@ -515,7 +515,7 @@ function hook_field_delete_revision($obj_type, $object, $field, $instance, $item * @param $items * $object->{$field['field_name']}, or an empty array if unset. */ -function hook_field_prepare_translation($obj_type, $object, $field, $instance, $items) { +function hook__field_prepare_translation($obj_type, $object, $field, $instance, $items) { } /** @@ -524,9 +524,9 @@ function hook_field_prepare_translation($obj_type, $object, $field, $instance, $ * Widgets are Form API elements with additional processing capabilities. * Widget hooks are typically called by the Field Attach API during the * creation of the field form structure with field_attach_form(). - * @see hook_field_widget_info_alter(). - * @see hook_field_widget(). - * @see hook_field_widget_error(). + * @see hook__field_widget_info_alter(). + * @see hook__field_widget(). + * @see hook__field_widget_error(). * * @return * An array describing the widget types implemented by the module. @@ -554,7 +554,7 @@ function hook_field_prepare_translation($obj_type, $object, $field, $instance, $ * FIELD_BEHAVIOR_DEFAULT (default) if the widget accepts default values. * FIELD_BEHAVIOR_NONE if the widget does not support default values. */ -function hook_field_widget_info() { +function hook__field_widget_info() { return array( 'text_textfield' => array( 'label' => t('Text field'), @@ -591,10 +591,10 @@ function hook_field_widget_info() { * Perform alterations on Field API widget types. * * @param $info - * Array of informations on widget types exposed by hook_field_widget_info() + * Array of informations on widget types exposed by hook__field_widget_info() * implementations. */ -function hook_field_widget_info_alter(&$info) { +function hook__field_widget_info_alter(&$info) { // Add a setting to a widget type. $info['text_textfield']['settings'] += array( 'mymodule_additional_setting' => 'default value', @@ -632,7 +632,7 @@ function hook_field_widget_info_alter(&$info) { * @return * The form item for a single element for this field. */ -function hook_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function hook__field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : '', @@ -649,12 +649,12 @@ function hook_field_widget(&$form, &$form_state, $field, $instance, $items, $del * structure. * @param $error * An associative array with the following key-value pairs, as returned by - * hook_field_validate(): + * hook__field_validate(): * - 'error': the error code. Complex widgets might need to report different * errors to different form elements inside the widget. * - 'message': the human readable message to be displayed. */ -function hook_field_widget_error($element, $error) { +function hook__field_widget_error($element, $error) { form_error($element['value'], $error['message']); } @@ -669,10 +669,10 @@ function hook_field_widget_error($element, $error) { * from formatter type names, following the pattern: * field_formatter_FORMATTER_NAME * The module implementing the formatters needs to register those theme hooks - * using hook_theme(). + * using hook__theme(). * - * @see hook_field_formatter_info(). - * @see hook_field_formatter_info_alter(). + * @see hook__field_formatter_info(). + * @see hook__field_formatter_info_alter(). * @see theme_field_formatter_FORMATTER_NAME(). * * @return @@ -698,7 +698,7 @@ function hook_field_widget_error($element, $error) { * takes care of displays all the field values. Examples: points on * a generated graph picture, a Google map, a single link to a popup... */ -function hook_field_formatter_info() { +function hook__field_formatter_info() { return array( 'text_default' => array( 'label' => t('Default'), @@ -750,7 +750,7 @@ function hook_field_formatter_info() { * Array of informations on formatter types exposed by * hook_field_field_formatter_info() implementations. */ -function hook_field_formatter_info_alter(&$info) { +function hook__field_formatter_info_alter(&$info) { // Add a setting to a formatter type. $info['text_default']['settings'] += array( 'mymodule_additional_setting' => 'default value', @@ -764,7 +764,7 @@ function hook_field_formatter_info_alter(&$info) { * Theme function for a field formatter. * * This is an example of a 'single' formatter, displaying one single field - * value (the hook_field_formatter_info() entry uses + * value (the hook__field_formatter_info() entry uses * 'multiple values' = FIELD_BEHAVIOR_DEFAULT). * * @param $element @@ -780,7 +780,7 @@ function hook_field_formatter_info_alter(&$info) { * - #settings: The array of formatter settings. */ function theme_field_formatter_FORMATTER_SINGLE($element) { - // This relies on a 'safe' element being prepared in hook_field_sanitize(). + // This relies on a 'safe' element being prepared in hook__field_sanitize(). return $element['#item']['safe']; } @@ -788,7 +788,7 @@ function theme_field_formatter_FORMATTER_SINGLE($element) { * Theme function for a field formatter. * * This is an example of a 'single' formatter, displaying all the field values - * (the hook_field_formatter_info() entry uses + * (the hook__field_formatter_info() entry uses * 'multiple values' = FIELD_BEHAVIOR_CUSTOM). * * @param $element @@ -826,7 +826,7 @@ function theme_field_formatter_FORMATTER_MULTIPLE($element) { * * See field_attach_form() for details and arguments. */ -function hook_field_attach_form($obj_type, $object, &$form, &$form_state) { +function hook__field_attach_form($obj_type, $object, &$form, &$form_state) { } /** @@ -855,7 +855,7 @@ function hook_field_attach_form($obj_type, $object, &$form, &$form_state) { * set as an empty array. * - Loaded field ids are set as keys in $skip_fields. */ -function hook_field_attach_pre_load($obj_type, $objects, $age, &$skip_fields) { +function hook__field_attach_pre_load($obj_type, $objects, $age, &$skip_fields) { } /** @@ -878,7 +878,7 @@ function hook_field_attach_pre_load($obj_type, $objects, $age, &$skip_fields) { * * See field_attach_load() for details and arguments. */ -function hook_field_attach_load($obj_type, $objects, $age) { +function hook__field_attach_load($obj_type, $objects, $age) { } /** @@ -888,7 +888,7 @@ function hook_field_attach_load($obj_type, $objects, $age) { * * See field_attach_validate() for details and arguments. */ -function hook_field_attach_validate($obj_type, $object, &$errors) { +function hook__field_attach_validate($obj_type, $object, &$errors) { } /** @@ -898,7 +898,7 @@ function hook_field_attach_validate($obj_type, $object, &$errors) { * * See field_attach_submit() for details and arguments. */ -function hook_field_attach_submit($obj_type, $object, $form, &$form_state) { +function hook__field_attach_submit($obj_type, $object, $form, &$form_state) { } /** @@ -908,7 +908,7 @@ function hook_field_attach_submit($obj_type, $object, $form, &$form_state) { * * See field_attach_presave() for details and arguments. */ -function hook_field_attach_presave($obj_type, $object) { +function hook__field_attach_presave($obj_type, $object) { } /** @@ -928,7 +928,7 @@ function hook_field_attach_presave($obj_type, $object) { * @return * Saved field ids are set set as keys in $skip_fields. */ -function hook_field_attach_pre_insert($obj_type, $object, &$skip_fields) { +function hook__field_attach_pre_insert($obj_type, $object, &$skip_fields) { } /** @@ -948,15 +948,15 @@ function hook_field_attach_pre_insert($obj_type, $object, &$skip_fields) { * @return * Saved field ids are set set as keys in $skip_fields. */ -function hook_field_attach_pre_update($obj_type, $object, &$skip_fields) { +function hook__field_attach_pre_update($obj_type, $object, &$skip_fields) { } /** * Act on field_attach_pre_query. * * This hook should be implemented by modules that use - * hook_field_attach_pre_load(), hook_field_attach_pre_insert() and - * hook_field_attach_pre_update() to bypass the regular storage engine, to + * hook__field_attach_pre_load(), hook__field_attach_pre_insert() and + * hook__field_attach_pre_update() to bypass the regular storage engine, to * handle field queries. * * @param $field_name @@ -982,7 +982,7 @@ function hook_field_attach_pre_update($obj_type, $object, &$skip_fields) { * The $skip_field parameter should be set to TRUE if the query has been * handled. */ -function hook_field_attach_pre_query($field_name, $conditions, $count, &$cursor = NULL, $age, &$skip_field) { +function hook__field_attach_pre_query($field_name, $conditions, $count, &$cursor = NULL, $age, &$skip_field) { } /** @@ -992,7 +992,7 @@ function hook_field_attach_pre_query($field_name, $conditions, $count, &$cursor * * See field_attach_delete() for details and arguments. */ -function hook_field_attach_delete($obj_type, $object) { +function hook__field_attach_delete($obj_type, $object) { } /** @@ -1002,7 +1002,7 @@ function hook_field_attach_delete($obj_type, $object) { * * See field_attach_delete_revision() for details and arguments. */ -function hook_field_attach_delete_revision($obj_type, $object) { +function hook__field_attach_delete_revision($obj_type, $object) { } /** @@ -1019,7 +1019,7 @@ function hook_field_attach_delete_revision($obj_type, $object) { * @param $build_mode * Build mode, e.g. 'full', 'teaser'... */ -function hook_field_attach_view_alter($output, $obj_type, $object, $build_mode) { +function hook__field_attach_view_alter($output, $obj_type, $object, $build_mode) { } /** @@ -1029,7 +1029,7 @@ function hook_field_attach_view_alter($output, $obj_type, $object, $build_mode) * * See field_attach_create_bundle() for details and arguments. */ -function hook_field_attach_create_bundle($bundle) { +function hook__field_attach_create_bundle($bundle) { } /** @@ -1039,7 +1039,7 @@ function hook_field_attach_create_bundle($bundle) { * * See field_attach_rename_bundle() for details and arguments. */ -function hook_field_attach_rename_bundle($bundle_old, $bundle_new) { +function hook__field_attach_rename_bundle($bundle_old, $bundle_new) { } /** @@ -1053,7 +1053,7 @@ function hook_field_attach_rename_bundle($bundle_old, $bundle_new) { * An array of all instances that existed for $bundle before it was * deleted. */ -function hook_field_attach_delete_bundle($bundle, $instances) { +function hook__field_attach_delete_bundle($bundle, $instances) { } /** @@ -1088,7 +1088,7 @@ function hook_field_attach_delete_bundle($bundle, $instances) { * Loaded field values are added to $objects. Fields with no values should be * set as an empty array. */ -function hook_field_storage_load($obj_type, $objects, $age, $skip_fields) { +function hook__field_storage_load($obj_type, $objects, $age, $skip_fields) { } /** @@ -1106,7 +1106,7 @@ function hook_field_storage_load($obj_type, $objects, $age, $skip_fields) { * therefore should not be written again. The values associated to these keys * are not specified. */ -function hook_field_storage_write($obj_type, $object, $op, $skip_fields) { +function hook__field_storage_write($obj_type, $object, $op, $skip_fields) { } /** @@ -1117,7 +1117,7 @@ function hook_field_storage_write($obj_type, $object, $op, $skip_fields) { * @param $object * The object on which to operate. */ -function hook_field_storage_delete($obj_type, $object) { +function hook__field_storage_delete($obj_type, $object) { } /** @@ -1131,9 +1131,9 @@ function hook_field_storage_delete($obj_type, $object) { * @param $object * The object on which to operate. The revision to delete is * indicated by the object's revision id property, as identified by - * hook_fieldable_info() for $obj_type. + * hook__fieldable_info() for $obj_type. */ -function hook_field_storage_delete_revision($obj_type, $object) { +function hook__field_storage_delete_revision($obj_type, $object) { } /** @@ -1155,7 +1155,7 @@ function hook_field_storage_delete_revision($obj_type, $object) { * @return * See field_attach_query(). */ -function hook_field_storage_query($field_name, $conditions, $count, &$cursor = NULL, $age) { +function hook__field_storage_query($field_name, $conditions, $count, &$cursor = NULL, $age) { } /** @@ -1164,7 +1164,7 @@ function hook_field_storage_query($field_name, $conditions, $count, &$cursor = N * @param $bundle * The name of the bundle being created. */ -function hook_field_storage_create_bundle($bundle) { +function hook__field_storage_create_bundle($bundle) { } /** @@ -1175,7 +1175,7 @@ function hook_field_storage_create_bundle($bundle) { * @param $bundle_new * The new name of the bundle. */ -function hook_field_storage_rename_bundle($bundle_old, $bundle_new) { +function hook__field_storage_rename_bundle($bundle_old, $bundle_new) { } /** @@ -1184,7 +1184,7 @@ function hook_field_storage_rename_bundle($bundle_old, $bundle_new) { * @param $field * The field structure being created. */ -function hook_field_storage_create_field($field) { +function hook__field_storage_create_field($field) { } /** @@ -1193,7 +1193,7 @@ function hook_field_storage_create_field($field) { * @param $field_name * The name of the field being deleted. */ -function hook_field_storage_delete_field($field_name) { +function hook__field_storage_delete_field($field_name) { } /** @@ -1204,7 +1204,7 @@ function hook_field_storage_delete_field($field_name) { * @param $bundle * The name of the bundle in the new instance. */ -function hook_field_storage_delete_instance($field_name, $bundle) { +function hook__field_storage_delete_instance($field_name, $bundle) { } /** @@ -1231,7 +1231,7 @@ function hook_field_storage_delete_instance($field_name, $bundle) { * @param $field * The field just created. */ -function hook_field_create_field($field) { +function hook__field_create_field($field) { } /** @@ -1243,7 +1243,7 @@ function hook_field_create_field($field) { * @param $instance * The instance just created. */ -function hook_field_create_instance($instance) { +function hook__field_create_instance($instance) { } /** @@ -1256,7 +1256,7 @@ function hook_field_create_instance($instance) { * @param $field * The field being deleted. */ -function hook_field_delete_field($field) { +function hook__field_delete_field($field) { } @@ -1271,7 +1271,7 @@ function hook_field_delete_field($field) { * @param $instance * The instance just updated. */ -function hook_field_update_instance($instance) { +function hook__field_update_instance($instance) { } /** @@ -1284,7 +1284,7 @@ function hook_field_update_instance($instance) { * @param $instance * The instance just updated. */ -function hook_field_delete_instance($instance) { +function hook__field_delete_instance($instance) { } /** @@ -1293,7 +1293,7 @@ function hook_field_delete_instance($instance) { * @param $field * The field record just read from the database. */ -function hook_field_read_field($field) { +function hook__field_read_field($field) { } /** @@ -1302,7 +1302,7 @@ function hook_field_read_field($field) { * @param $instance * The instance record just read from the database. */ -function hook_field_read_instance($instance) { +function hook__field_read_instance($instance) { } /** @@ -1320,7 +1320,7 @@ function hook_field_read_instance($instance) { * Whether 'build modes' is actually a 'fields' concept is to be debated * in a separate overhaul patch for core. */ -function hook_field_build_modes($obj_type) { +function hook__field_build_modes($obj_type) { } /** @@ -1338,5 +1338,5 @@ function hook_field_build_modes($obj_type) { * TRUE if the operation is allowed; * FALSE if the operation is denied. */ -function hook_field_access($op, $field, $account) { +function hook__field_access($op, $field, $account) { } diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index a7efc4c..3ddc0dd 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -90,7 +90,7 @@ define('FIELD_STORAGE_INSERT', 'insert'); * $obj_type is the type of the fieldable entity, such as 'node' or * 'user', and $object is the object itself. An individual object's * bundle, if any, is read from the object's bundle key property - * identified by hook_fieldable_info() for $obj_type. + * identified by hook__fieldable_info() for $obj_type. * * Fieldable types call Field Attach API functions during their own * API calls; for example, node_load() calls field_attach_load(). A @@ -102,13 +102,13 @@ define('FIELD_STORAGE_INSERT', 'insert'); * for any object after the operation is complete, and access or * modify all the field, form, or display data for that object and * operation. For example, field_attach_view() invokes - * hook_field_attach_view_alter(). These all-module hooks are distinct from - * those of the Field Types API, such as hook_field_load(), that are + * hook__field_attach_view_alter(). These all-module hooks are distinct from + * those of the Field Types API, such as hook__field_load(), that are * only invoked for the module that defines a specific field type. * * field_attach_load(), field_attach_insert(), and * field_attach_update() also define pre-operation hooks, - * e.g. hook_field_attach_pre_load(). These hooks run before the + * e.g. hook__field_attach_pre_load(). These hooks run before the * corresponding Field Storage API and Field Type API operations. * They allow modules to define additional storage locations * (e.g. denormalizing, mirroring) for field data on a per-field @@ -540,12 +540,12 @@ function field_attach_load($obj_type, $objects, $age = FIELD_LOAD_CURRENT, $opti // Fetch other objects from their storage location. if ($queried_objects) { // The invoke order is: - // - hook_field_attach_pre_load() - // - storage engine's hook_field_storage_load() - // - field-type module's hook_field_load() - // - hook_field_attach_load() + // - hook__field_attach_pre_load() + // - storage engine's hook__field_storage_load() + // - field-type module's hook__field_load() + // - hook__field_attach_load() - // Invoke hook_field_attach_pre_load(): let any module load field + // Invoke hook__field_attach_pre_load(): let any module load field // data before the storage engine, accumulating along the way. $skip_fields = array(); foreach (module_implements('field_attach_pre_load') as $module) { @@ -553,14 +553,14 @@ function field_attach_load($obj_type, $objects, $age = FIELD_LOAD_CURRENT, $opti $function($obj_type, $queried_objects, $age, $skip_fields, $options); } - // Invoke the storage engine's hook_field_storage_load(): the field storage + // Invoke the storage engine's hook__field_storage_load(): the field storage // engine loads the rest. module_invoke(variable_get('field_storage_module', 'field_sql_storage'), 'field_storage_load', $obj_type, $queried_objects, $age, $skip_fields, $options); - // Invoke field-type module's hook_field_load(). + // Invoke field-type module's hook__field_load(). _field_invoke_multiple('load', $obj_type, $queried_objects, $age, $options); - // Invoke hook_field_attach_load(): let other modules act on loading the + // Invoke hook__field_attach_load(): let other modules act on loading the // object. foreach (module_implements('field_attach_load') as $module) { $function = $module . '__field_attach_load'; @@ -650,7 +650,7 @@ function field_attach_validate($obj_type, $object) { * #element_validate property during normal form validation. * - Field validation steps are common to a given field type, independently of * the specific widget being used in a given form. They are defined in the - * field type's implementation of hook_field_validate(). + * field type's implementation of hook__field_validate(). * * This function performs field validation in the context of a form * submission. It converts field validation errors into form errors @@ -849,7 +849,7 @@ function field_attach_delete_revision($obj_type, $object) { * * Note that the query 'conditions' only apply to the stored values. * In a regular field_attach_load() call, field values additionally go through - * hook_field_load() and hook_field_attach_load() invocations, which can add + * hook__field_load() and hook__field_attach_load() invocations, which can add * to or affect the raw stored values. The results of field_attach_query() * might therefore differ from what could be expected by looking at a regular, * fully loaded object. diff --git a/modules/field/field.crud.inc b/modules/field/field.crud.inc index 7bd0845..f430f35 100644 --- a/modules/field/field.crud.inc +++ b/modules/field/field.crud.inc @@ -42,7 +42,7 @@ * in $object->$field_name. * - type (string) * The type of the field, such as 'text' or 'image'. Field types - * are defined by modules that implement hook_field_info(). + * are defined by modules that implement hook__field_info(). * - cardinality (integer) * The number of values the field can hold. Legal values are any * positive integer or FIELD_CARDINALITY_UNLIMITED. @@ -118,7 +118,7 @@ * for the field when used by this bundle. * - type (string) * The type of the widget, such as text_textfield. Widget types - * are defined by modules that implement hook_field_widget_info(). + * are defined by modules that implement hook__field_widget_info(). * - settings (array) * A sub-array of key/value pairs of widget-type-specific settings. * Each field widget type module defines and documents its own @@ -167,7 +167,7 @@ * @{ * Create, update, and delete Field API fields, bundles, and instances. * - * Modules use this API, often in hook_install(), to create custom + * Modules use this API, often in hook__install(), to create custom * data structures. UI modules will use it to create a user interface. * * The Field CRUD API uses @@ -186,14 +186,14 @@ * - cardinality: 1 * - locked: FALSE * - indexes: the field-type indexes, specified by the field type's - * hook_field_schema(). The indexes specified in $field are added + * hook__field_schema(). The indexes specified in $field are added * to those default indexes. It is possible to override the * definition of a field-type index by providing an index with the * same name, or to remove it by redefining it as an empty array * of columns. Overriding field-type indexes should be done * carefully, for it might seriously affect the site's performance. * - settings: each omitted setting is given the default value defined in - * hook_field_info(). + * hook__field_info(). * @return * The $field structure with the id property filled in. * @throw @@ -406,18 +406,18 @@ function field_delete_field($field_name) { * - required: FALSE * - default_value_function: empty string * - settings: each omitted setting is given the default value specified in - * hook_field_info(). + * hook__field_info(). * - widget: - * - type: the default widget specified in hook_field_info(). + * - type: the default widget specified in hook__field_info(). * - settings: each omitted setting is given the default value specified in - * hook_field_widget_info(). + * hook__field_widget_info(). * - display: * Settings for the 'full' build mode will be added, and each build mode * will be completed with the follwong default values: * - label: 'above' - * - type: the default formatter specified in hook_field_info(). + * - type: the default formatter specified in hook__field_info(). * - settings: each omitted setting is given the default value specified in - * hook_field_formatter_info(). + * hook__field_formatter_info(). * @return * The $instance structure with the id property filled in. * @throw @@ -704,15 +704,15 @@ function field_delete_instance($field_name, $bundle) { * * Deleting field data items for an object with field_attach_delete() involves * three separate operations: - * - Invoking the Field Type API hook_field_delete() for each field on the + * - Invoking the Field Type API hook__field_delete() for each field on the * object. The hook for each field type receives the object and the specific * field being deleted. A file field module might use this hook to delete * uploaded files from the filesystem. - * - Invoking the Field Storage API hook_field_storage_delete() to remove + * - Invoking the Field Storage API hook__field_storage_delete() to remove * data from the primary field storage. The hook implementation receives the * object being deleted and deletes data for all of the object's bundle's * fields. - * - Invoking the global Field Attach API hook_field_attach_delete() for all + * - Invoking the global Field Attach API hook__field_attach_delete() for all * modules that implement it. Each hook implementation receives the object * being deleted and can operate on whichever subset of the object's bundle's * fields it chooses to. @@ -834,7 +834,7 @@ function field_purge_batch($batch_size) { * The deleted field instance whose data is being purged. */ function field_purge_data($obj_type, $object, $field, $instance) { - // Each field type's hook_field_delete() only expects to operate on a single + // Each field type's hook__field_delete() only expects to operate on a single // field at a time, so we can use it as-is for purging. $options = array('field_id' => $instance['field_id'], 'deleted' => TRUE); _field_invoke('delete', $obj_type, $object, $dummy, $dummy, $options); diff --git a/modules/field/field.default.inc b/modules/field/field.default.inc index 063ff54..ff81c34 100644 --- a/modules/field/field.default.inc +++ b/modules/field/field.default.inc @@ -81,7 +81,7 @@ function field_default_view($obj_type, $object, $field, $instance, $items, $buil '#theme' => 'field', '#weight' => $display['weight'], '#title' => check_plain(t($instance['label'])), - '#access' => field_access('view', $field), + '#access' => field__access('view', $field), '#label_display' => $label_display, '#build_mode' => $build_mode, '#single' => $single, diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index 97a5f18..d553e2b 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -22,7 +22,7 @@ function field_default_form($obj_type, $object, $field, $instance, $items, &$for // If the field is not accessible, don't add anything. The field value will // be left unchanged on update, or considered empty on insert (default value // will be inserted if applicable). - if (!field_access('edit', $field)) { + if (!field__access('edit', $field)) { return $addition; } @@ -304,7 +304,7 @@ function field_default_form_errors($obj_type, $object, $field, $instance, $items } else { // Make sure that errors are reported (even incorrectly flagged) if - // the widget module fails to implement hook_field_widget_error(). + // the widget module fails to implement hook__field_widget_error(). form_error($error_element, $error['error']); } } diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc index 06eb107..d8c9dd5 100644 --- a/modules/field/field.info.inc +++ b/modules/field/field.info.inc @@ -38,24 +38,24 @@ function _field_info_cache_clear() { * If $reset is TRUE, nothing. * If $reset is FALSE, an array containing the following elements: * - * field types: array of hook_field_info() results, keyed by field_type. + * field types: array of hook__field_info() results, keyed by field_type. * * label, description, settings, instance_settings, default_widget, - * default_formatter, behaviors: from hook_field_info() + * default_formatter, behaviors: from hook__field_info() * * module: the module that exposes the field type * - * widget types: array of hook_field_widget_info() results, keyed by + * widget types: array of hook__field_widget_info() results, keyed by * widget_type. - * * label, field types, settings, behaviors: from hook_field_widget_info() + * * label, field types, settings, behaviors: from hook__field_widget_info() * * module: module that exposes the widget type * - * formatter types: array of hook_field_formatter_info() results, keyed by + * formatter types: array of hook__field_formatter_info() results, keyed by * formatter_type. - * * label, field types, behaviors: from hook_field_formatter_info() + * * label, field types, behaviors: from hook__field_formatter_info() * * module: module that exposes the formatter type - * fieldable types: array of hook_fieldable_info() results, keyed by entity_type. + * fieldable types: array of hook__fieldable_info() results, keyed by entity_type. * * name, id key, revision key, bundle key, cacheable, bundles: from - * hook_fieldable_info() + * hook__fieldable_info() * * module: module that exposes the entity type */ function _field_info_collate_types($reset = FALSE) { @@ -331,13 +331,13 @@ function field_behaviors_formatter($op, $display) { } /** - * Return hook_field_info() data. + * Return hook__field_info() data. * * @param $field_type * (optional) A field type name. If ommitted, all field types will be * returned. * @return - * Either a field type description, as provided by hook_field_info(), or an + * Either a field type description, as provided by hook__field_info(), or an * array of all existing field types, keyed by field type name. */ function field_info_field_types($field_type = NULL) { @@ -354,14 +354,14 @@ function field_info_field_types($field_type = NULL) { } /** - * Return hook_field_widget_info() data. + * Return hook__field_widget_info() data. * * @param $widget_type * (optional) A widget type name. If ommitted, all widget types will be * returned. * @return * Either a widget type description, as provided by - * hook_field_widget_info(), or an array of all existing widget + * hook__field_widget_info(), or an array of all existing widget * types, keyed by widget type name. */ function field_info_widget_types($widget_type = NULL) { @@ -378,13 +378,13 @@ function field_info_widget_types($widget_type = NULL) { } /** - * Return hook_field_formatter_info() data. + * Return hook__field_formatter_info() data. * * @param $formatter_type * (optional) A formatter type name. If ommitted, all formatter types will be * returned. * @return - * Either a formatter type description, as provided by hook_field_formatter_info(), + * Either a formatter type description, as provided by hook__field_formatter_info(), * or an array of all existing widget types, keyed by widget type name. */ function field_info_formatter_types($formatter_type = NULL) { @@ -401,13 +401,13 @@ function field_info_formatter_types($formatter_type = NULL) { } /** - * Return hook_fieldable_info() data. + * Return hook__fieldable_info() data. * * @param $obj_type * (optional) A fieldable type name. If ommitted, all fieldable types will be * returned. * @return - * Either a fieldable type description, as provided by hook_fieldable_info(), + * Either a fieldable type description, as provided by hook__fieldable_info(), * or an array of all existing fieldable types, keyed by fieldable type name. */ function field_info_fieldable_types($obj_type = NULL) { @@ -536,7 +536,7 @@ function field_info_instance($field_name, $bundle_name) { * @param $type * A field type name. * @return - * The field type's default settings, as provided by hook_field_info(), or an + * The field type's default settings, as provided by hook__field_info(), or an * empty array. */ function field_info_field_settings($type) { @@ -551,7 +551,7 @@ function field_info_field_settings($type) { * A field type name. * @return * The field type's default instance settings, as provided by - * hook_field_info(), or an empty array. + * hook__field_info(), or an empty array. */ function field_info_instance_settings($type) { $info = field_info_field_types($type); @@ -564,7 +564,7 @@ function field_info_instance_settings($type) { * @param $type * A widget type name. * @return - * The field type's default settings, as provided by hook_field_info(), or an + * The field type's default settings, as provided by hook__field_info(), or an * empty array. */ function field_info_widget_settings($type) { @@ -579,7 +579,7 @@ function field_info_widget_settings($type) { * A field formatter type name. * @return * The field formatter's default settings, as provided by - * hook_field_info(), or an empty array. + * hook__field_info(), or an empty array. */ function field_info_formatter_settings($type) { $info = field_info_formatter_types($type); diff --git a/modules/field/field.install b/modules/field/field.install index f9ab498..17a160c 100644 --- a/modules/field/field.install +++ b/modules/field/field.install @@ -7,16 +7,16 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function field_install() { +function field__install() { drupal_install_schema('field'); } /** * Implement hook_schema. */ -function field_schema() { +function field__schema() { // Static (meta) tables. $schema['field_config'] = array( 'fields' => array( @@ -82,7 +82,7 @@ function field_schema() { 'field_name' => array('field_name'), // used by field_read_fields() 'active_deleted' => array('active', 'deleted'), - // used by field_modules_disabled() + // used by field__modules_disabled() 'module' => array('module'), // used by field_associate_fields() 'type' => array('type'), @@ -129,7 +129,7 @@ function field_schema() { 'field_name_bundle' => array('field_name', 'bundle'), // used by field_read_instances() 'widget_active_deleted' => array('widget_active', 'deleted'), - // used by field_modules_disabled() + // used by field__modules_disabled() 'widget_module' => array('widget_module'), // used by field_associate_fields() 'widget_type' => array('widget_type'), diff --git a/modules/field/field.module b/modules/field/field.module index cb64dc8..8a32c44 100644 --- a/modules/field/field.module +++ b/modules/field/field.module @@ -36,7 +36,7 @@ require(DRUPAL_ROOT . '/modules/field/field.attach.inc'); * * - @link field_crud Field CRUD API @endlink. Create, updates, and * deletes fields, bundles (a.k.a. "content types"), and instances. - * Modules use this API, often in hook_install(), to create + * Modules use this API, often in hook__install(), to create * custom data structures. The Content Construction Kit * user-interface module uses this API for its major functionality. * @@ -124,14 +124,14 @@ class FieldException extends Exception {} /** * Implement hook_flush_caches. */ -function field_flush_caches() { +function field__flush_caches() { return array('cache_field'); } /** - * Implement hook_help(). + * Implement hook__help(). */ -function field_help($path, $arg) { +function field__help($path, $arg) { switch ($path) { case 'admin/help#field': $output = '

' . t('The Field API allows custom data fields to be attached to Drupal objects and takes care of storing, loading, editing, and rendering field data. Any object type (node, user, etc.) can use the Field API to make itself "fieldable" and thus allow fields to be attached to it.') . '

'; @@ -141,16 +141,16 @@ function field_help($path, $arg) { } /** - * Implement hook_init(). + * Implement hook__init(). */ -function field_init() { +function field__init() { drupal_add_css(drupal_get_path('module', 'field') . '/theme/field.css'); } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function field_menu() { +function field__menu() { $items = array(); // Callback for AHAH add more buttons. @@ -164,9 +164,9 @@ function field_menu() { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function field_theme() { +function field__theme() { $path = drupal_get_path('module', 'field') . '/theme'; return array( @@ -182,26 +182,26 @@ function field_theme() { } /** - * Implement hook_cron(). + * Implement hook__cron(). * * Purges some deleted Field API data, if any exists. */ -function field_cron() { +function field__cron() { $limit = variable_get('field_purge_batch_size', 10); field_purge_batch($limit); } /** - * Implement hook_modules_installed(). + * Implement hook__modules_installed(). */ -function field_modules_installed($modules) { +function field__modules_installed($modules) { field_cache_clear(); } /** - * Implement hook_modules_uninstalled(). + * Implement hook__modules_uninstalled(). */ -function field_modules_uninstalled($modules) { +function field__modules_uninstalled($modules) { module_load_include('inc', 'field', 'field.crud'); foreach ($modules as $module) { // TODO D7: field_module_delete is not yet implemented @@ -210,9 +210,9 @@ function field_modules_uninstalled($modules) { } /** - * Implement hook_modules_enabled(). + * Implement hook__modules_enabled(). */ -function field_modules_enabled($modules) { +function field__modules_enabled($modules) { foreach ($modules as $module) { field_associate_fields($module); } @@ -220,9 +220,9 @@ function field_modules_enabled($modules) { } /** - * Implement hook_modules_disabled(). + * Implement hook__modules_disabled(). */ -function field_modules_disabled($modules) { +function field__modules_disabled($modules) { foreach ($modules as $module) { db_update('field_config') ->fields(array('active' => 0)) @@ -420,7 +420,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL, $field = field_info_field($field); } - if (field_access('view', $field)) { + if (field__access('view', $field)) { $field_type = field_info_field_types($field['type']); // We need $field, $instance, $obj_type, $object to be able to display a value... @@ -538,7 +538,7 @@ function field_view_field($obj_type, $object, $field, $instance, $build_mode = ' * TRUE if the operation is allowed; * FALSE if the operation is denied. */ -function field_access($op, $field, $account = NULL) { +function field__access($op, $field, $account = NULL) { global $user; if (is_null($account)) { diff --git a/modules/field/field.test b/modules/field/field.test index fb46008..a58b601 100644 --- a/modules/field/field.test +++ b/modules/field/field.test @@ -55,8 +55,8 @@ class FieldAttachTestCase extends DrupalWebTestCase { * updates random field data and then loads and verifies the data. */ function testFieldAttachSaveLoad() { - // Configure the instance so that we test hook_field_load() (see - // field_test_field_load() in field_test.module). + // Configure the instance so that we test hook__field_load() (see + // field_test__field_load() in field_test.module). $this->instance['settings']['test_hook_field_load'] = TRUE; field_update_instance($this->instance); @@ -91,7 +91,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { // The field value loaded matches the one inserted or updated. $this->assertEqual($entity->{$this->field_name}[$delta]['value'] , $values[$current_revision][$delta]['value'], t('Currrent revision: expected value %delta was found.', array('%delta' => $delta))); - // The value added in hook_field_load() is found. + // The value added in hook__field_load() is found. $this->assertEqual($entity->{$this->field_name}[$delta]['additional_key'], 'additional_value', t('Currrent revision: extra information for value %delta was found', array('%delta' => $delta))); } @@ -104,7 +104,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { for ($delta = 0; $delta < $this->field['cardinality']; $delta++) { // The field value loaded matches the one inserted or updated. $this->assertEqual($entity->{$this->field_name}[$delta]['value'], $values[$revision_id][$delta]['value'], t('Revision %revision_id: expected value %delta was found.', array('%revision_id' => $revision_id, '%delta' => $delta))); - // The value added in hook_field_load() is found. + // The value added in hook__field_load() is found. $this->assertEqual($entity->{$this->field_name}[$delta]['additional_key'], 'additional_value', t('Revision %revision_id: extra information for value %delta was found', array('%revision_id' => $revision_id, '%delta' => $delta))); } } @@ -142,8 +142,8 @@ class FieldAttachTestCase extends DrupalWebTestCase { 'field_name' => $field_names[$i], 'bundle' => $bundles[$bundle], 'settings' => array( - // Configure the instance so that we test hook_field_load() - // (see field_test_field_load() in field_test.module). + // Configure the instance so that we test hook__field_load() + // (see field_test__field_load() in field_test.module). 'test_hook_field_load' => TRUE, ), ); @@ -170,7 +170,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { foreach ($instances as $field_name => $instance) { // The field value loaded matches the one inserted. $this->assertEqual($entity->{$field_name}[0]['value'], $values[$index][$field_name], t('Entity %index: expected value was found.', array('%index' => $index))); - // The value added in hook_field_load() is found. + // The value added in hook__field_load() is found. $this->assertEqual($entity->{$field_name}[0]['additional_key'], 'additional_value', t('Entity %index: extra information was found', array('%index' => $index))); } } @@ -580,7 +580,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { function testFieldAttachCreateRenameBundle() { // Create a new bundle. This has to be initiated by the module so that its - // hook_fieldable_info() is consistent. + // hook__fieldable_info() is consistent. $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); field_test_create_bundle($new_bundle); @@ -601,7 +601,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { $this->assertEqual(count($entity->{$this->field_name}), $this->field['cardinality'], "Data are retrieved for the new bundle"); // Rename the bundle. This has to be initiated by the module so that its - // hook_fieldable_info() is consistent. + // hook__fieldable_info() is consistent. $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); field_test_rename_bundle($this->instance['bundle'], $new_bundle); @@ -617,7 +617,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { function testFieldAttachDeleteBundle() { // Create a new bundle. This has to be initiated by the module so that its - // hook_fieldable_info() is consistent. + // hook__fieldable_info() is consistent. $new_bundle = 'test_bundle_' . drupal_strtolower($this->randomName()); field_test_create_bundle($new_bundle); @@ -657,7 +657,7 @@ class FieldAttachTestCase extends DrupalWebTestCase { $this->assertEqual(count($entity->{$field_name}), 1, "Second field got loaded"); // Delete the bundle. This has to be initiated by the module so that its - // hook_fieldable_info() is consistent. + // hook__fieldable_info() is consistent. field_test_delete_bundle($this->instance['bundle']); // Verify no data gets loaded @@ -883,9 +883,9 @@ class FieldInfoTestCase extends DrupalWebTestCase { */ function testFieldInfo() { // Test that field_test module's fields, widgets, and formatters show up. - $field_test_info = field_test_field_info(); - $formatter_info = field_test_field_formatter_info(); - $widget_info = field_test_field_widget_info(); + $field_test_info = field_test__field_info(); + $formatter_info = field_test__field_formatter_info(); + $widget_info = field_test__field_widget_info(); $info = field_info_field_types(); foreach ($field_test_info as $t_key => $field_type) { @@ -1041,18 +1041,18 @@ class FieldInfoTestCase extends DrupalWebTestCase { * Test that the field_info settings convenience functions work. */ function testSettingsInfo() { - $info = field_test_field_info(); + $info = field_test__field_info(); foreach ($info as $type => $data) { $this->assertIdentical(field_info_field_settings($type), $data['settings'], "field_info_field_settings returns {$type}'s field settings"); $this->assertIdentical(field_info_instance_settings($type), $data['instance_settings'], "field_info_field_settings returns {$type}'s field instance settings"); } - $info = field_test_field_widget_info(); + $info = field_test__field_widget_info(); foreach ($info as $type => $data) { $this->assertIdentical(field_info_widget_settings($type), $data['settings'], "field_info_widget_settings returns {$type}'s widget settings"); } - $info = field_test_field_formatter_info(); + $info = field_test__field_formatter_info(); foreach ($info as $type => $data) { $this->assertIdentical(field_info_formatter_settings($type), $data['settings'], "field_info_formatter_settings returns {$type}'s formatter settings"); } @@ -1377,7 +1377,7 @@ class FieldCrudTestCase extends DrupalWebTestCase { field_test_memorize(); $field_definition = field_create_field($field_definition); $mem = field_test_memorize(); - $this->assertIdentical($mem['field_test_field_create_field'][0][0], $field_definition, 'hook_field_create_field() called with correct arguments.'); + $this->assertIdentical($mem['field_test_field_create_field'][0][0], $field_definition, 'hook__field_create_field() called with correct arguments.'); // Read the raw record from the {field_config_instance} table. $result = db_query('SELECT * FROM {field_config} WHERE field_name = :field_name', array(':field_name' => $field_definition['field_name'])); @@ -1966,7 +1966,7 @@ class FieldBulkDeleteTestCase extends DrupalWebTestCase { $this->assertEqual($count ? count($found['test_entity']) : count($found), $count, 'Correct number of objects found after purging 2'); } - // hook_field_delete() was called on a pseudo-object for each object. Each + // hook__field_delete() was called on a pseudo-object for each object. Each // pseudo object has a $field property that matches the original object, // but no others. $mem = field_test_memorize(); @@ -1975,7 +1975,7 @@ class FieldBulkDeleteTestCase extends DrupalWebTestCase { $count = count($stubs); foreach ($mem['field_test_field_delete'] as $args) { $obj = $args[1]; - $this->assertEqual($stubs[$obj->ftid], $obj, 'hook_field_delete() called with the correct stub'); + $this->assertEqual($stubs[$obj->ftid], $obj, 'hook__field_delete() called with the correct stub'); unset($stubs[$obj->ftid]); } $this->assertEqual(count($stubs), $count-10, 'hook_field_delete was called with each object once'); diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.install b/modules/field/modules/field_sql_storage/field_sql_storage.install index 11c4e87..5aa40e6 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.install +++ b/modules/field/modules/field_sql_storage/field_sql_storage.install @@ -7,23 +7,23 @@ */ /** - * Implement hook_install(). + * Implement hook__install(). */ -function field_sql_storage_install() { +function field_sql_storage__install() { drupal_install_schema('field_sql_storage'); } /** - * Implement hook_uninstall(). + * Implement hook__uninstall(). */ -function field_sql_storage_uninstall() { +function field_sql_storage__uninstall() { drupal_uninstall_schema('field_sql_storage'); } /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function field_sql_storage_schema() { +function field_sql_storage__schema() { $schema = array(); // Static (meta-data) tables. diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module index d77526b..735a8a1 100644 --- a/modules/field/modules/field_sql_storage/field_sql_storage.module +++ b/modules/field/modules/field_sql_storage/field_sql_storage.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_help(). + * Implement hook__help(). */ -function field_sql_storage_help($path, $arg) { +function field_sql_storage__help($path, $arg) { switch ($path) { case 'admin/help#field_sql_storage': $output = '

' . t('The Field SQL Storage module stores Field API data in the database. It is the default field storage module, but other field storage modules may be available in the contributions repository.') . '

'; @@ -178,9 +178,9 @@ function _field_sql_storage_schema($field) { } /** - * Implement hook_field_storage_create_field(). + * Implement hook__field_storage_create_field(). */ -function field_sql_storage_field_storage_create_field($field) { +function field_sql_storage__field_storage_create_field($field) { $schema = _field_sql_storage_schema($field); foreach ($schema as $name => $table) { db_create_table($ret, $name, $table); @@ -188,9 +188,9 @@ function field_sql_storage_field_storage_create_field($field) { } /** - * Implement hook_field_storage_delete_field(). + * Implement hook__field_storage_delete_field(). */ -function field_sql_storage_field_storage_delete_field($field_name) { +function field_sql_storage__field_storage_delete_field($field_name) { // Mark all data associated with the field for deletion. $field = field_info_field($field_name); $table = _field_sql_storage_tablename($field); @@ -200,9 +200,9 @@ function field_sql_storage_field_storage_delete_field($field_name) { } /** - * Implement hook_field_storage_load(). + * Implement hook__field_storage_load(). */ -function field_sql_storage_field_storage_load($obj_type, $objects, $age, $skip_fields, $options) { +function field_sql_storage__field_storage_load($obj_type, $objects, $age, $skip_fields, $options) { $etid = _field_sql_storage_etid($obj_type); $load_current = $age == FIELD_LOAD_CURRENT; @@ -265,9 +265,9 @@ function field_sql_storage_field_storage_load($obj_type, $objects, $age, $skip_f } /** - * Implement hook_field_storage_write(). + * Implement hook__field_storage_write(). */ -function field_sql_storage_field_storage_write($obj_type, $object, $op, $skip_fields) { +function field_sql_storage__field_storage_write($obj_type, $object, $op, $skip_fields) { list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object); $etid = _field_sql_storage_etid($obj_type); @@ -340,11 +340,11 @@ function field_sql_storage_field_storage_write($obj_type, $object, $op, $skip_fi } /** - * Implement hook_field_storage_delete(). + * Implement hook__field_storage_delete(). * * This function deletes data for all fields for an object from the database. */ -function field_sql_storage_field_storage_delete($obj_type, $object) { +function field_sql_storage__field_storage_delete($obj_type, $object) { list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object); $etid = _field_sql_storage_etid($obj_type); @@ -379,9 +379,9 @@ function field_sql_storage_field_storage_purge($obj_type, $object, $field, $inst } /** - * Implement hook_field_storage_query(). + * Implement hook__field_storage_query(). */ -function field_sql_storage_field_storage_query($field_id, $conditions, $count, &$cursor, $age) { +function field_sql_storage__field_storage_query($field_id, $conditions, $count, &$cursor, $age) { $load_current = $age == FIELD_LOAD_CURRENT; $field = field_info_field_by_id($field_id); @@ -479,11 +479,11 @@ function field_sql_storage_field_storage_query($field_id, $conditions, $count, & } /** - * Implement hook_field_storage_delete_revision(). + * Implement hook__field_storage_delete_revision(). * * This function actually deletes the data from the database. */ -function field_sql_storage_field_storage_delete_revision($obj_type, $object) { +function field_sql_storage__field_storage_delete_revision($obj_type, $object) { list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object); $etid = _field_sql_storage_etid($obj_type); @@ -503,11 +503,11 @@ function field_sql_storage_field_storage_delete_revision($obj_type, $object) { } /** - * Implement hook_field_storage_delete_instance(). + * Implement hook__field_storage_delete_instance(). * * This function simply marks for deletion all data associated with the field. */ -function field_sql_storage_field_storage_delete_instance($field_name, $bundle) { +function field_sql_storage__field_storage_delete_instance($field_name, $bundle) { $field = field_read_field($field_name); $table_name = _field_sql_storage_tablename($field); $revision_name = _field_sql_storage_revision_tablename($field); @@ -522,9 +522,9 @@ function field_sql_storage_field_storage_delete_instance($field_name, $bundle) { } /** - * Implement hook_field_storage_rename_bundle(). + * Implement hook__field_storage_rename_bundle(). */ -function field_sql_storage_field_storage_rename_bundle($bundle_old, $bundle_new) { +function field_sql_storage__field_storage_rename_bundle($bundle_old, $bundle_new) { $instances = field_info_instances($bundle_old); foreach ($instances as $instance) { $field = field_read_field($instance['field_name']); diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module index 8f78c38..308c5fa 100644 --- a/modules/field/modules/list/list.module +++ b/modules/field/modules/list/list.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function list_theme() { +function list__theme() { return array( 'field_formatter_list_default' => array( 'arguments' => array('element' => NULL), @@ -21,9 +21,9 @@ function list_theme() { } /** - * Implement hook_field_info(). + * Implement hook__field_info(). */ -function list_field_info() { +function list__field_info() { return array( 'list' => array( 'label' => t('List'), @@ -57,9 +57,9 @@ function list_field_info() { } /** - * Implement hook_field_schema(). + * Implement hook__field_schema(). */ -function list_field_schema($field) { +function list__field_schema($field) { switch ($field['type']) { case 'list_text': $columns = array( @@ -98,12 +98,12 @@ function list_field_schema($field) { } /** - * Implement hook_field_validate(). + * Implement hook__field_validate(). * * Possible error codes: * - 'list_illegal_value': The value is not part of the list of allowed values. */ -function list_field_validate($obj_type, $object, $field, $instance, $items, &$errors) { +function list__field_validate($obj_type, $object, $field, $instance, $items, &$errors) { $allowed_values = list_allowed_values($field); foreach ($items as $delta => $item) { if (!empty($item['value'])) { @@ -118,9 +118,9 @@ function list_field_validate($obj_type, $object, $field, $instance, $items, &$er } /** - * Implement hook_field_is_empty(). + * Implement hook__field_is_empty(). */ -function list_field_is_empty($item, $field) { +function list__field_is_empty($item, $field) { if (empty($item['value']) && (string)$item['value'] !== '0') { return TRUE; } @@ -128,9 +128,9 @@ function list_field_is_empty($item, $field) { } /** - * Implement hook_field_formatter_info(). + * Implement hook__field_formatter_info(). */ -function list_field_formatter_info() { +function list__field_formatter_info() { return array( 'list_default' => array( 'label' => t('Default'), diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module index e8d9069..62527fa 100644 --- a/modules/field/modules/number/number.module +++ b/modules/field/modules/number/number.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function number_theme() { +function number__theme() { return array( 'number' => array('arguments' => array('element' => NULL)), 'field_formatter_number_integer' => array('arguments' => array('element' => NULL), 'function' => 'theme_field_formatter_number'), @@ -19,9 +19,9 @@ function number_theme() { } /** - * Implement hook_field_info(). + * Implement hook__field_info(). */ -function number_field_info() { +function number__field_info() { return array( 'number_integer' => array( 'label' => t('Integer'), @@ -49,9 +49,9 @@ function number_field_info() { } /** - * Implement hook_field_schema(). + * Implement hook__field_schema(). */ -function number_field_schema($field) { +function number__field_schema($field) { switch ($field['type']) { case 'number_integer' : $columns = array( @@ -88,13 +88,13 @@ function number_field_schema($field) { } /** - * Implement hook_field_validate(). + * Implement hook__field_validate(). * * Possible error codes: * - 'number_min': The value is smaller than the allowed minimum value. * - 'number_max': The value is larger than the allowed maximum value. */ -function number_field_validate($obj_type, $node, $field, $instance, $items, &$errors) { +function number__field_validate($obj_type, $node, $field, $instance, $items, &$errors) { foreach ($items as $delta => $item) { if ($item['value'] != '') { if (is_numeric($instance['settings']['min']) && $item['value'] < $instance['settings']['min']) { @@ -116,7 +116,7 @@ function number_field_validate($obj_type, $node, $field, $instance, $items, &$er /** * Implement hook_content_is_empty(). */ -function number_field_is_empty($item, $field) { +function number__field_is_empty($item, $field) { if (empty($item['value']) && (string)$item['value'] !== '0') { return TRUE; } @@ -124,9 +124,9 @@ function number_field_is_empty($item, $field) { } /** - * Implement hook_field_formatter_info(). + * Implement hook__field_formatter_info(). */ -function number_field_formatter_info() { +function number__field_formatter_info() { return array( 'number_integer' => array( 'label' => t('default'), @@ -190,7 +190,7 @@ function theme_field_formatter_number($element) { } /** - * Implement hook_field_widget_info(). + * Implement hook__field_widget_info(). * * Here we indicate that the Field module will handle * multiple values for these widgets. @@ -200,7 +200,7 @@ function theme_field_formatter_number($element) { * as an example for custom modules that might do things * differently. */ -function number_field_widget_info() { +function number__field_widget_info() { return array( 'number' => array( 'label' => t('Text field'), @@ -210,7 +210,7 @@ function number_field_widget_info() { } /** - * Implement FAPI hook_elements(). + * Implement FAPI hook__elements(). * * Any FAPI callbacks needed for individual widgets can be declared here, * and the element will be passed to those callbacks for processing. @@ -221,7 +221,7 @@ function number_field_widget_info() { * Includes a regex to check for valid values as an additional parameter * the validator can use. The regex can be overridden if necessary. */ -function number_elements() { +function number__elements() { return array( 'number' => array( '#input' => TRUE, @@ -232,7 +232,7 @@ function number_elements() { } /** - * Implement hook_field_widget(). + * Implement hook__field_widget(). * * Attach a single form element to the form. It will be built out and * validated in the callback(s) listed in hook_elements. We build it @@ -260,7 +260,7 @@ function number_elements() { * @return * the form item for a single element for this field */ -function number_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function number__field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : NULL, @@ -269,9 +269,9 @@ function number_field_widget(&$form, &$form_state, $field, $instance, $items, $d } /** - * Implement hook_field_widget_error(). + * Implement hook__field_widget_error(). */ -function number_field_widget_error($element, $error) { +function number__field_widget_error($element, $error) { form_error($element['value'], $error['message']); } diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module index 8ca7ace..6c9b8e9 100644 --- a/modules/field/modules/options/options.module +++ b/modules/field/modules/options/options.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function options_theme() { +function options__theme() { return array( 'options_select' => array( 'arguments' => array('element' => NULL), @@ -27,7 +27,7 @@ function options_theme() { } /** - * Implement hook_field_widget_info(). + * Implement hook__field_widget_info(). * * We need custom handling of multiple values because we need * to combine them into a options list rather than display @@ -39,7 +39,7 @@ function options_theme() { * as an example for custom modules that might do things * differently. */ -function options_field_widget_info() { +function options__field_widget_info() { return array( 'options_select' => array( @@ -67,7 +67,7 @@ function options_field_widget_info() { } /** - * Implement FAPI hook_elements(). + * Implement FAPI hook__elements(). * * Any FAPI callbacks needed for individual widgets can be declared here, * and the element will be passed to those callbacks for processing. @@ -75,7 +75,7 @@ function options_field_widget_info() { * Drupal will automatically theme the element using a theme with * the same name as the hook_elements key. */ -function options_elements() { +function options__elements() { return array( 'options_select' => array( '#input' => TRUE, @@ -96,9 +96,9 @@ function options_elements() { } /** - * Implement hook_field_widget(). + * Implement hook__field_widget(). */ -function options_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = NULL) { +function options__field_widget(&$form, &$form_state, $field, $instance, $items, $delta = NULL) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => !empty($items) ? $items : array(), @@ -107,9 +107,9 @@ function options_field_widget(&$form, &$form_state, $field, $instance, $items, $ } /** - * Implement hook_field_widget_error(). + * Implement hook__field_widget_error(). */ -function options_field_widget_error($element, $error) { +function options__field_widget_error($element, $error) { $field_key = $element['#columns'][0]; form_error($element[$field_key], $error['message']); } @@ -257,7 +257,7 @@ function options_onoff_elements_process($element, &$form_state, $form) { /** * FAPI function to validate options element. */ -function options_validate($element, &$form_state) { +function options__validate($element, &$form_state) { // Transpose selections from field => delta to delta => field, // turning cardinality selected options into cardinality parent elements. // Immediate parent is the delta, need to get back to parent's parent diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module index 05343de..51b6962 100644 --- a/modules/field/modules/text/text.module +++ b/modules/field/modules/text/text.module @@ -7,9 +7,9 @@ */ /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function text_theme() { +function text__theme() { return array( 'text_textarea' => array( 'arguments' => array('element' => NULL), @@ -36,7 +36,7 @@ function text_theme() { } /** - * Implement hook_field_info(). + * Implement hook__field_info(). * * Field settings: * - max_length: the maximum length for a varchar field. @@ -46,7 +46,7 @@ function text_theme() { * When empty and not displayed the summary will take its value from the * trimmed value of the main text field. */ -function text_field_info() { +function text__field_info() { return array( 'text' => array( 'label' => t('Text'), @@ -76,9 +76,9 @@ function text_field_info() { } /** - * Implement hook_field_schema(). + * Implement hook__field_schema(). */ -function text_field_schema($field) { +function text__field_schema($field) { switch ($field['type']) { case 'text': $columns = array( @@ -129,13 +129,13 @@ function text_field_schema($field) { } /** - * Implement hook_field_validate(). + * Implement hook__field_validate(). * * Possible error codes: * - 'text_value_max_length': The value exceeds the maximum length. * - 'text_summary_max_length': The summary exceeds the maximum length. */ -function text_field_validate($obj_type, $object, $field, $instance, $items, &$errors) { +function text__field_validate($obj_type, $object, $field, $instance, $items, &$errors) { foreach ($items as $delta => $item) { foreach (array('value' => t('full text'), 'summary' => t('summary')) as $column => $desc) { if (!empty($item[$column])) { @@ -159,21 +159,21 @@ function text_field_validate($obj_type, $object, $field, $instance, $items, &$er } /** - * Implement hook_field_load(). + * Implement hook__field_load(). * * Where possible, generate the sanitized version of each field early so that * it is cached in the field cache. This avoids looking up from the filter cache * separately. - * @see text_field_sanitize(). + * @see text__field_sanitize(). */ -function text_field_load($obj_type, $objects, $field, $instances, &$items) { +function text__field_load($obj_type, $objects, $field, $instances, &$items) { global $language; foreach ($objects as $id => $object) { foreach ($items[$id] as $delta => $item) { if (!empty($instances[$id]['settings']['text_processing'])) { // Only process items with a cacheable format, the rest will be - // handled by text_field_sanitize(). + // handled by text__field_sanitize(). $format = $item['format']; if (filter_format_allowcache($format)) { $lang = isset($object->language) ? $object->language : $language->language; @@ -194,15 +194,15 @@ function text_field_load($obj_type, $objects, $field, $instances, &$items) { } /** - * Implement hook_field_sanitize(). + * Implement hook__field_sanitize(). * - * @see text_field_load() + * @see text__field_load() */ -function text_field_sanitize($obj_type, $object, $field, $instance, &$items) { +function text__field_sanitize($obj_type, $object, $field, $instance, &$items) { global $language; foreach ($items as $delta => $item) { // Only sanitize items which were not already processed inside - // text_field_load(), i.e. items with uncacheable text formats, or coming + // text__field_load(), i.e. items with uncacheable text formats, or coming // from a form preview. if (!isset($items[$delta]['safe'])) { if (!empty($instance['settings']['text_processing'])) { @@ -224,9 +224,9 @@ function text_field_sanitize($obj_type, $object, $field, $instance, &$items) { } /** - * Implement hook_field_is_empty(). + * Implement hook__field_is_empty(). */ -function text_field_is_empty($item, $field) { +function text__field_is_empty($item, $field) { if (empty($item['value']) && (string)$item['value'] !== '0') { return TRUE; } @@ -234,9 +234,9 @@ function text_field_is_empty($item, $field) { } /** - * Implement hook_field_formatter_info(). + * Implement hook__field_formatter_info(). */ -function text_field_formatter_info() { +function text__field_formatter_info() { return array( 'text_default' => array( 'label' => t('Default'), @@ -436,7 +436,7 @@ function text_summary($text, $format = NULL, $size = NULL) { } /** - * Implement hook_field_widget_info(). + * Implement hook__field_widget_info(). * * Here we indicate that the field module will handle * the default value and multiple values for these widgets. @@ -446,7 +446,7 @@ function text_summary($text, $format = NULL, $size = NULL) { * as an example for custom modules that might do things * differently. */ -function text_field_widget_info() { +function text__field_widget_info() { return array( 'text_textfield' => array( 'label' => t('Text field'), @@ -467,7 +467,7 @@ function text_field_widget_info() { } /** - * Implement FAPI hook_elements(). + * Implement FAPI hook__elements(). * * Any FAPI callbacks needed for individual widgets can be declared here, * and the element will be passed to those callbacks for processing. @@ -478,7 +478,7 @@ function text_field_widget_info() { * Autocomplete_path is not used by text_field_widget but other * widgets can use it (see nodereference and userreference). */ -function text_elements() { +function text__elements() { return array( 'text_textfield' => array( '#input' => TRUE, @@ -505,7 +505,7 @@ function text_elements() { } /** - * Implement hook_field_widget(). + * Implement hook__field_widget(). * * Attach a single form element to the form. It will be built out and * validated in the callback(s) listed in hook_elements. We build it @@ -536,7 +536,7 @@ function text_elements() { * @return * the form item for a single element for this field */ -function text_field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { +function text__field_widget(&$form, &$form_state, $field, $instance, $items, $delta = 0) { $element = array( '#type' => $instance['widget']['type'], '#default_value' => isset($items[$delta]) ? $items[$delta] : '', @@ -549,9 +549,9 @@ function text_field_widget(&$form, &$form_state, $field, $instance, $items, $del } /** - * Implement hook_field_widget_error(). + * Implement hook__field_widget_error(). */ -function text_field_widget_error($element, $error) { +function text__field_widget_error($element, $error) { switch ($error['error']) { case 'text_summary_max_length': $error_element = $element[$element['#columns'][1]]; @@ -576,7 +576,7 @@ function text_field_widget_error($element, $error) { * TODO: For widgets to be actual FAPI 'elements', reusable outside of a * 'field' context, they shoudn't rely on $field and $instance. The bits of * information needed to adjust the behavior of the 'element' should be - * extracted in hook_field_widget() above. + * extracted in hook__field_widget() above. */ function text_textfield_elements_process($element, $form_state, $form) { $field = $form['#fields'][$element['#field_name']]['field']; diff --git a/modules/filter/filter.api.php b/modules/filter/filter.api.php index 162e99a..acbf96d 100644 --- a/modules/filter/filter.api.php +++ b/modules/filter/filter.api.php @@ -102,10 +102,10 @@ * module can return $text for operations it does not use/need. * * For a detailed usage example, see filter_example.module. For an example of - * using multiple filters in one module, see filter_filter() and - * filter_filter_tips(). + * using multiple filters in one module, see filter__filter() and + * filter__filter_tips(). */ -function hook_filter($op, $delta = 0, $format = -1, $text = '', $langcode = '', $cache_id = 0) { +function hook__filter($op, $delta = 0, $format = -1, $text = '', $langcode = '', $cache_id = 0) { switch ($op) { case 'list': return array(0 => t('Code filter')); @@ -149,7 +149,7 @@ function hook_filter($op, $delta = 0, $format = -1, $text = '', $langcode = '', * * */ -function hook_filter_tips($delta, $format, $long = FALSE) { +function hook__filter_tips($delta, $format, $long = FALSE) { if ($long) { return t('To post pieces of code, surround them with <code>...</code> tags. For PHP code, you can use <?php ... ?>, which will also colour it based on syntax.'); } diff --git a/modules/filter/filter.install b/modules/filter/filter.install index e7f8223..5e54496 100644 --- a/modules/filter/filter.install +++ b/modules/filter/filter.install @@ -7,9 +7,9 @@ */ /** - * Implement hook_schema(). + * Implement hook__schema(). */ -function filter_schema() { +function filter__schema() { $schema['filter'] = array( 'description' => 'Table that maps filters (HTML corrector) to text formats (Filtered HTML).', 'fields' => array( diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 5e760ac..6228b38 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -15,9 +15,9 @@ define('FILTER_FORMAT_DEFAULT', 0); /** - * Implement hook_help(). + * Implement hook__help(). */ -function filter_help($path, $arg) { +function filter__help($path, $arg) { switch ($path) { case 'admin/help#filter': $output = '

' . t("The filter module allows administrators to configure text formats for use on your site. A text format defines the HTML tags, codes, and other input allowed in both content and comments, and is a key feature in guarding against potentially damaging input from malicious users. Two formats included by default are Filtered HTML (which allows only an administrator-approved subset of HTML tags) and Full HTML (which allows the full set of HTML tags). Additional formats may be created by an administrator.") . '

'; @@ -41,9 +41,9 @@ function filter_help($path, $arg) { } /** - * Implement hook_theme(). + * Implement hook__theme(). */ -function filter_theme() { +function filter__theme() { return array( 'filter_admin_overview' => array( 'arguments' => array('form' => NULL), @@ -67,9 +67,9 @@ function filter_theme() { } /** - * Implement hook_menu(). + * Implement hook__menu(). */ -function filter_menu() { +function filter__menu() { $items['admin/settings/formats'] = array( 'title' => 'Text formats', 'description' => 'Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.', @@ -145,9 +145,9 @@ function filter_admin_format_title($format) { } /** - * Implement hook_permission(). + * Implement hook__permission(). */ -function filter_permission() { +function filter__permission() { return array( 'administer filters' => array( 'title' => t('Administer filters'), @@ -157,18 +157,18 @@ function filter_permission() { } /** - * Implement hook_cron(). + * Implement hook__cron(). * * Expire outdated filter cache entries */ -function filter_cron() { +function filter__cron() { cache_clear_all(NULL, 'cache_filter'); } /** - * Implement hook_filter_tips(). + * Implement hook__filter_tips(). */ -function filter_filter_tips($delta, $format, $long = FALSE) { +function filter__filter_tips($delta, $format, $long = FALSE) { global $base_url; switch ($delta) { case 0: @@ -396,11 +396,11 @@ function filter_list_format($format) { * Modules which need to have content filtered can use these functions to * interact with the filter system. * - * For more info, see the hook_filter() documentation. + * For more info, see the hook__filter() documentation. * * Note: because filters can inject JavaScript or execute PHP code, security is * vital here. When a user supplies a $format, you should validate it with - * filter_access($format) before accepting/using it. This is normally done in + * filter__access($format) before accepting/using it. This is normally done in * the validation stage of the node system. You should for example never make a * preview of content in a disallowed format. */ @@ -418,7 +418,7 @@ function filter_list_format($format) { * English. This allows filters to be language aware so language specific * text replacement can be implemented. * @param $check - * Whether to check the $format with filter_access() first. Defaults to TRUE. + * Whether to check the $format with filter__access() first. Defaults to TRUE. * Note that this will check the permissions of the current user, so you * should specify $check = FALSE when viewing other people's content. When * showing content that is not (yet) stored in the database (eg. upon preview), @@ -430,7 +430,7 @@ function filter_list_format($format) { */ function check_markup($text, $format = FILTER_FORMAT_DEFAULT, $langcode = '', $check = TRUE, $cache = TRUE) { // When $check = TRUE, do an access check on $format. - if (isset($text) && (!$check || filter_access($format))) { + if (isset($text) && (!$check || filter__access($format))) { $format = filter_resolve_format($format); // Check for a cached version of this piece of text. @@ -528,7 +528,7 @@ function filter_form($value = FILTER_FORMAT_DEFAULT, $weight = NULL, $parents = /** * Returns TRUE if the user is allowed to access this format. */ -function filter_access($format) { +function filter__access($format) { $format = filter_resolve_format($format); if (user_access('administer filters') || ($format == variable_get('filter_default_format', 1))) { return TRUE; @@ -642,7 +642,7 @@ function theme_filter_guidelines($format) { */ /** - * Implement hook_filter(). + * Implement hook__filter(). * * Set up a basic set of essential filters: * - Limit allowed HTML tags: @@ -657,7 +657,7 @@ function theme_filter_guidelines($format) { * - Escape all HTML: * Converts all HTML tags into visible text. */ -function filter_filter($op, $delta = 0, $format = -1, $text = '') { +function filter__filter($op, $delta = 0, $format = -1, $text = '') { switch ($op) { case 'list': return array(0 => t('Limit allowed HTML tags'), 1 => t('Convert line breaks'), 2 => t('Convert URLs into links'), 3 => t('Correct broken HTML'), 4 => t('Escape all HTML')); diff --git a/modules/filter/filter.test b/modules/filter/filter.test index c77964a..292ca59 100644 --- a/modules/filter/filter.test +++ b/modules/filter/filter.test @@ -425,31 +425,31 @@ class FilterUnitTest extends DrupalWebTestCase { // HTML filter is not able to secure some tags, these should never be // allowed. - $f = filter_filter('process', 0, 'no_such_format', '