diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-05-14 08:33:39 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-05-14 08:33:39 -0400 |
| commit | 40f516cf3da0cece3865e5a8d1827375a67c3ac9 (patch) | |
| tree | 536d6169ef27b16d40cf217da4ad54b566b3be15 /includes | |
| parent | 7d1ae1167ddf733278841824aa0df7dab2f34661 (diff) | |
| download | brdo-40f516cf3da0cece3865e5a8d1827375a67c3ac9.tar.gz brdo-40f516cf3da0cece3865e5a8d1827375a67c3ac9.tar.bz2 | |
- Patch #759844 by jpmckinney, dixon_, plach, ksenzee, fabsor, pillarsdotnet: overlay does not work with prefixed URL paths.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/common.inc b/includes/common.inc index 6c25676e1..4168ec9a2 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3950,10 +3950,15 @@ function drupal_add_js($data = NULL, $options = NULL) { // Add jquery.js and drupal.js, as well as the basePath setting, the // first time a JavaScript file is added. if (empty($javascript)) { + // url() generates the prefix using hook_url_outbound_alter(). Instead of + // running the hook_url_outbound_alter() again here, extract the prefix + // from url(). + url('', array('prefix' => &$prefix)); $javascript = array( 'settings' => array( 'data' => array( array('basePath' => base_path()), + array('pathPrefix' => empty($prefix) ? '' : $prefix), ), 'type' => 'setting', 'scope' => 'header', |