From 7f4598d8d1c3055ec2c89d3cb691010175674bb6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 6 Feb 2010 15:43:42 +0000
Subject: - Patch #619566 by catch: clean-up code now drupal_alter has caching.

---
 includes/common.inc | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'includes/common.inc')

diff --git a/includes/common.inc b/includes/common.inc
index 168fcc12c..227acca2e 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2447,8 +2447,6 @@ function format_username($account) {
  * alternative than url().
  */
 function url($path = NULL, array $options = array()) {
-  static $url_outbound;
-
   // Merge in defaults.
   $options += array(
     'fragment' => '',
@@ -2471,15 +2469,7 @@ function url($path = NULL, array $options = array()) {
   // Preserve the original path before altering or aliasing.
   $original_path = $path;
 
-  // Allow other modules to alter the outbound URL and options.
-  // Since PHP code cannot be unloaded, we statically cache the implementations
-  // of hook_url_outbound_alter() and only invoke them in case there are any.
-  if (!isset($url_outbound)) {
-    $url_outbound = (bool) module_implements('url_outbound_alter');
-  }
-  if ($url_outbound) {
-    drupal_alter('url_outbound', $path, $options, $original_path);
-  }
+  drupal_alter('url_outbound', $path, $options, $original_path);
 
   if ($options['fragment']) {
     $options['fragment'] = '#' . $options['fragment'];
-- 
cgit v1.2.3