diff options
| author | Cesar G <prototech91@gmail.com> | 2014-05-16 22:05:15 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-05-16 22:05:15 -0700 |
| commit | 35edb62bb0cc1dbbcf77241a8443b68f7a333873 (patch) | |
| tree | f71235d35acaffce2e4f608b6fdd72451dfb35c5 /phpBB/includes/functions.php | |
| parent | e31739212d06ea2706e01c3bf87207f4eaa82110 (diff) | |
| parent | 8b5b318f0a1ea97693eb62626ac94778fe586566 (diff) | |
| download | forums-35edb62bb0cc1dbbcf77241a8443b68f7a333873.tar forums-35edb62bb0cc1dbbcf77241a8443b68f7a333873.tar.gz forums-35edb62bb0cc1dbbcf77241a8443b68f7a333873.tar.bz2 forums-35edb62bb0cc1dbbcf77241a8443b68f7a333873.tar.xz forums-35edb62bb0cc1dbbcf77241a8443b68f7a333873.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12547] Rename jquery.js to jquery.min.js in assets directory
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a0e2a46f54..49568bb1b2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4974,7 +4974,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'T_UPLOAD_PATH' => "{$web_path}{$config['upload_path']}/", 'T_STYLESHEET_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/stylesheet.css?assets_version=' . $config['assets_version'], 'T_STYLESHEET_LANG_LINK' => "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme/' . $user->lang_name . '/stylesheet.css?assets_version=' . $config['assets_version'], - 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.js?assets_version=" . $config['assets_version'], + 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery.min.js?assets_version=" . $config['assets_version'], 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'T_THEME_NAME' => rawurlencode($user->style['style_path']), |