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

Fix #513 - Fix strict errors

Browse Source
This commit is contained in:
Ben Word
2012-08-18 19:44:47 -05:00
parent bf222893b6
commit 431e2fafae
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
functions.php
View File

@@ -1,4 +1,5 @@
<?php <?php
error_reporting( E_ALL | E_STRICT );
/** /**
* Roots functions * Roots functions
*/ */

4
inc/cleanup.php
View File

@@ -434,11 +434,11 @@ class Roots_Nav_Walker extends Walker_Nav_Menu {
return preg_match('/(current[-_])|active|dropdown/', $classes); return preg_match('/(current[-_])|active|dropdown/', $classes);
} }
function start_lvl(&$output, $depth) { function start_lvl(&$output, $depth = 0, $args = array()) {
$output .= "\n<ul class=\"dropdown-menu\">\n"; $output .= "\n<ul class=\"dropdown-menu\">\n";
} }
function start_el(&$output, $item, $depth, $args) { function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
global $wp_query; global $wp_query;
$indent = ($depth) ? str_repeat("\t", $depth) : ''; $indent = ($depth) ? str_repeat("\t", $depth) : '';

3
inc/config.php
View File

@@ -30,10 +30,11 @@ function roots_sidebar_class() {
echo 'span4'; echo 'span4';
} }
$get_theme_name = explode('/themes/', get_template_directory());
define('GOOGLE_ANALYTICS_ID', ''); // UA-XXXXX-Y define('GOOGLE_ANALYTICS_ID', ''); // UA-XXXXX-Y
define('POST_EXCERPT_LENGTH', 40); define('POST_EXCERPT_LENGTH', 40);
define('WP_BASE', wp_base_dir()); define('WP_BASE', wp_base_dir());
define('THEME_NAME', next(explode('/themes/', get_template_directory()))); define('THEME_NAME', next($get_theme_name));
define('RELATIVE_PLUGIN_PATH', str_replace(site_url() . '/', '', plugins_url())); define('RELATIVE_PLUGIN_PATH', str_replace(site_url() . '/', '', plugins_url()));
define('FULL_RELATIVE_PLUGIN_PATH', WP_BASE . '/' . RELATIVE_PLUGIN_PATH); define('FULL_RELATIVE_PLUGIN_PATH', WP_BASE . '/' . RELATIVE_PLUGIN_PATH);
define('RELATIVE_CONTENT_PATH', str_replace(site_url() . '/', '', content_url())); define('RELATIVE_CONTENT_PATH', str_replace(site_url() . '/', '', content_url()));