diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/bootstrap.inc | 2 | ||||
| -rw-r--r-- | includes/common.inc | 8 | ||||
| -rw-r--r-- | includes/locale.inc | 4 | ||||
| -rw-r--r-- | includes/path.inc | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 335156ec3..f378ce9eb 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -601,7 +601,7 @@ function drupal_get_messages($type = NULL) { } /** - * Perform an access check for a given mask and rule type. Rules are usually created via admin/access/rules page. + * Perform an access check for a given mask and rule type. Rules are usually created via admin/user/rules page. */ function drupal_is_denied($type, $mask) { $allow = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 1 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask)); diff --git a/includes/common.inc b/includes/common.inc index 66c4341fa..934f8a829 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -230,7 +230,7 @@ function drupal_get_destination() { * the query string of an URI) or the $_REQUEST['edit']-array (i.e. by * using a hidden form field). This is used to direct the user back to * the proper page after completing a form. For example, after editing - * a post on the 'admin/node'-page or after having logged on using the + * a post on the 'admin/content/node'-page or after having logged on using the * 'user login'-block in a sidebar. The function drupal_get_destination() * can be used to help set the destination URL. * @@ -940,7 +940,7 @@ function format_date($timestamp, $type = 'medium', $format = '', $timezone = NUL * Generate a URL from a Drupal menu path. Will also pass-through existing URLs. * * @param $path - * The Drupal path being linked to, such as "admin/node", or an existing URL + * The Drupal path being linked to, such as "admin/content/node", or an existing URL * like "http://drupal.org/". * @param $query * A query string to append to the link or URL. @@ -1058,11 +1058,11 @@ function drupal_attributes($attributes = array()) { * @param $text * The text to be enclosed with the anchor tag. * @param $path - * The Drupal path being linked to, such as "admin/node". Can be an external + * The Drupal path being linked to, such as "admin/content/node". Can be an external * or internal URL. * - If you provide the full URL, it will be considered an * external URL. - * - If you provide only the path (e.g. "admin/node"), it is considered an + * - If you provide only the path (e.g. "admin/content/node"), it is considered an * internal link. In this case, it must be a system URL as the url() function * will generate the alias. * @param $attributes diff --git a/includes/locale.inc b/includes/locale.inc index bf5ed75ed..7fa3aa9c3 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -199,7 +199,7 @@ function locale_add_language_form_submit($form_id, $form_values) { _locale_add_language($form_values['langcode'], $isocodes[$form_values['langcode']][0]); } - return 'admin/locale'; + return 'admin/settings/locale'; } /** @@ -264,7 +264,7 @@ function _locale_admin_import_submit($form_id, $form_values) { watchdog('locale', $message, WATCHDOG_ERROR); } - return 'admin/locale'; + return 'admin/settings/locale'; } /** diff --git a/includes/path.inc b/includes/path.inc index f2c5141fe..9112cb146 100644 --- a/includes/path.inc +++ b/includes/path.inc @@ -123,9 +123,9 @@ function drupal_get_normal_path($path) { /** * Return a component of the current Drupal path. * - * When viewing a page at the path "admin/node/configure", for example, arg(0) - * would return "admin", arg(1) would return "node", and arg(2) would return - * "configure". + * When viewing a page at the path "admin/content/types", for example, arg(0) + * would return "admin", arg(1) would return "content", and arg(2) would return + * "types". * * Avoid use of this function where possible, as resulting code is hard to read. * Instead, attempt to use named arguments in menu callback functions. See the |