Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.756.2.43 diff -u -p -r1.756.2.43 common.inc --- includes/common.inc 14 Jan 2009 23:54:01 -0000 1.756.2.43 +++ includes/common.inc 28 Jan 2009 21:57:41 -0000 @@ -1411,7 +1411,6 @@ function url($path = NULL, $options = ar global $base_url; static $script; - static $clean_url; if (!isset($script)) { // On some web servers, such as IIS, we can't omit "index.php". So, we @@ -1420,11 +1419,6 @@ function url($path = NULL, $options = ar $script = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === FALSE) ? 'index.php' : ''; } - // Cache the clean_url variable to improve performance. - if (!isset($clean_url)) { - $clean_url = (bool)variable_get('clean_url', '0'); - } - if (!isset($options['base_url'])) { // The base_url might be rewritten from the language rewrite in domain mode. $options['base_url'] = $base_url; @@ -1450,7 +1444,7 @@ function url($path = NULL, $options = ar $prefix = empty($path) ? rtrim($options['prefix'], '/') : $options['prefix']; $path = drupal_urlencode($prefix . $path); - if ($clean_url) { + if (variable_get('clean_url', '0')) { // With Clean URLs. if ($options['query']) { return $base . $path .'?'. $options['query'] . $options['fragment'];