framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #472 from jamescostian/master

Browse Source 
Corrected home URL for subdir installs
This commit is contained in:
Ben Word
2012-06-11 19:34:21 -07:00
parent b089166082 aef67d23b8
commit 1429e33933
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/cleanup.php
View File

@@ -61,8 +61,8 @@ function roots_root_relative_url($input) {
'!(https?://[^/|"]+)([^"]+)?!', '!(https?://[^/|"]+)([^"]+)?!',
create_function( create_function(
'$matches', '$matches',
// If full URL is home_url("/"), return a slash for relative root // If full URL is home_url("/") and this isn't a subdir install, return a slash for relative root
'if (isset($matches[0]) && $matches[0] === home_url("/")) { return "/";' . 'if (isset($matches[0]) && $matches[0] === home_url("/") && str_replace("http://", "", home_url("/", "http"))==$_SERVER["HTTP_HOST"]) { return "/";' .
// If domain is equal to home_url("/"), then make URL relative // If domain is equal to home_url("/"), then make URL relative
'} elseif (isset($matches[0]) && strpos($matches[0], home_url("/")) !== false) { return $matches[2];' . '} elseif (isset($matches[0]) && strpos($matches[0], home_url("/")) !== false) { return $matches[2];' .
// If domain is not equal to home_url("/"), do not make external link relative // If domain is not equal to home_url("/"), do not make external link relative

12
inc/scripts.php
View File

@@ -1,16 +1,16 @@
<?php <?php
function roots_scripts() { function roots_scripts() {
wp_enqueue_style('roots_bootstrap_style', get_template_directory_uri() . '/css/bootstrap.css', false, null); wp_enqueue_style('roots_bootstrap_style', '/css/bootstrap.css', false, null);
if (current_theme_supports('bootstrap-responsive')) { if (current_theme_supports('bootstrap-responsive')) {
wp_enqueue_style('roots_bootstrap_responsive_style', get_template_directory_uri() . '/css/bootstrap-responsive.css', array('roots_bootstrap_style'), null); wp_enqueue_style('roots_bootstrap_responsive_style', '/css/bootstrap-responsive.css', array('roots_bootstrap_style'), null);
} }
// If you're not using Bootstrap, include H5BP's style.css: // If you're not using Bootstrap, include H5BP's style.css:
// wp_enqueue_style('roots_style', get_template_directory_uri() . '/css/style.css', false, null); // wp_enqueue_style('roots_style', '/css/style.css', false, null);
wp_enqueue_style('roots_app_style', get_template_directory_uri() . '/css/app.css', false, null); wp_enqueue_style('roots_app_style', '/css/app.css', false, null);
if (is_child_theme()) { if (is_child_theme()) {
wp_enqueue_style('roots_child_style', get_stylesheet_uri()); wp_enqueue_style('roots_child_style', get_stylesheet_uri());
@@ -25,8 +25,8 @@ function roots_scripts() {
wp_enqueue_script('comment-reply'); wp_enqueue_script('comment-reply');
} }
wp_register_script('roots_plugins', get_template_directory_uri() . '/js/plugins.js', false, null, false); wp_register_script('roots_plugins', '/js/plugins.js', false, null, false);
wp_register_script('roots_main', get_template_directory_uri() . '/js/main.js', false, null, false); wp_register_script('roots_main', '/js/main.js', false, null, false);
wp_enqueue_script('roots_plugins'); wp_enqueue_script('roots_plugins');
wp_enqueue_script('roots_main'); wp_enqueue_script('roots_main');
} }