Skip to content
Snippets Groups Projects
Commit d483256e authored by ale's avatar ale
Browse files

Remove useless patch pieces

parent b4d88eb9
Branches
Tags
No related merge requests found
......@@ -77,37 +77,6 @@ diff --git a/wp-content/themes/hybrid/library/admin/settings-page.php b/wp-conte
index ce1ddffe..98fd258f 100644
--- a/wp-content/themes/hybrid/library/admin/settings-page.php
+++ b/wp-content/themes/hybrid/library/admin/settings-page.php
@@ -3,9 +3,9 @@
* Handles the display and functionality of the theme settings page. This provides the needed hooks and
* meta box calls for developers to create any number of theme settings needed.
*
- * Provides the ability for developers to add custom meta boxes to the theme settings page by using the
- * add_meta_box() function. Developers should hook their meta box registration function to 'admin_menu'
- * and register the meta box for 'appearance_page-theme-settings'. If data needs to be saved, devs can
+ * Provides the ability for developers to add custom meta boxes to the theme settings page by using the
+ * add_meta_box() function. Developers should hook their meta box registration function to 'admin_menu'
+ * and register the meta box for 'appearance_page-theme-settings'. If data needs to be saved, devs can
* use the '$prefix_update_settings_page' action hook to save their data.
*
* @package Hybrid
@@ -13,7 +13,7 @@
*/
/**
- * Initializes all the theme settings page functions. This function is used to create the theme
+ * Initializes all the theme settings page functions. This function is used to create the theme
* settings page, then use that as a launchpad for specific actions that need to be tied to the
* settings page.
*
@@ -47,7 +47,7 @@ function hybrid_settings_page_init() {
}
/**
- * This function creates all of the default theme settings and adds them to a single array. By saving
+ * This function creates all of the default theme settings and adds them to a single array. By saving
* them in one array, the function only creates one setting in the {$wpdb->prefix}_options table.
*
* @since 0.4
@@ -64,20 +64,20 @@ function hybrid_theme_settings() {
'superfish_js' => true,
'seo_plugin' => false,
......@@ -134,75 +103,6 @@ index ce1ddffe..98fd258f 100644
* hook for saving custom settings.
*
* @since 0.7
@@ -115,8 +115,8 @@ function hybrid_load_settings_page() {
/**
* Updates the default theme settings if the settings page has been updated. It validates the values
- * added through the default theme settings page meta boxes. Only settings returned by the
- * hybrid_theme_settings() function will be saved. Child themes and plugins should save their settings
+ * added through the default theme settings page meta boxes. Only settings returned by the
+ * hybrid_theme_settings() function will be saved. Child themes and plugins should save their settings
* separately.
*
* @since 0.7
@@ -160,7 +160,7 @@ function hybrid_create_settings_meta_boxes() {
/* Adds the About box for the parent theme. */
add_meta_box( "{$prefix}-about-theme-meta-box", sprintf( __( 'About %1$s', $domain ), $theme_data['Title'] ), 'hybrid_about_theme_meta_box', $hybrid->settings_page, 'normal', 'high' );
-
+
/* If the user is using a child theme, add an About box for it. */
if ( TEMPLATEPATH != STYLESHEETPATH ) {
$child_data = get_theme_data( STYLESHEETPATH . '/style.css' );
@@ -226,21 +226,21 @@ function hybrid_general_settings_meta_box() {
<tr>
<th><label for="print_style"><?php _e( 'Stylesheets:', $domain ); ?></label></th>
<td>
- <input id="print_style" name="print_style" type="checkbox" <?php if ( hybrid_get_setting( 'print_style' ) ) echo 'checked="checked"'; ?> value="true" />
+ <input id="print_style" name="print_style" type="checkbox" <?php if ( hybrid_get_setting( 'print_style' ) ) echo 'checked="checked"'; ?> value="true" />
<label for="print_style"><?php _e( 'Select this to have the theme automatically include a print stylesheet.', $domain ); ?></label>
</td>
</tr>
<tr>
<th><label for="superfish_js"><?php _e( 'JavaScript:', $domain ); ?></label></th>
<td>
- <input id="superfish_js" name="superfish_js" type="checkbox" <?php if ( hybrid_get_setting( 'superfish_js' ) ) echo 'checked="checked"'; ?> value="true" />
+ <input id="superfish_js" name="superfish_js" type="checkbox" <?php if ( hybrid_get_setting( 'superfish_js' ) ) echo 'checked="checked"'; ?> value="true" />
<label for="superfish_js"><?php _e( 'Include the drop-down menu JavaScript.', $domain ); ?></label>
</td>
</tr>
<tr>
<th><label for="use_menus"><?php _e( 'Menus:', $domain ); ?></label></th>
<td>
- <input id="use_menus" name="use_menus" type="checkbox" <?php if ( hybrid_get_setting( 'use_menus' ) ) echo 'checked="checked"'; ?> value="true" />
+ <input id="use_menus" name="use_menus" type="checkbox" <?php if ( hybrid_get_setting( 'use_menus' ) ) echo 'checked="checked"'; ?> value="true" />
<label for="use_menus"><?php _e( 'Use the WordPress 3.0+ menu system? Child themes built prior to <em>Hybrid</em> 0.8 may need to be updated to use this.', $domain ); ?></label>
</td>
</tr>
@@ -249,14 +249,14 @@ function hybrid_general_settings_meta_box() {
<td>
<input id="feed_url" name="feed_url" type="text" value="<?php echo hybrid_get_setting( 'feed_url' ); ?>" size="30" /><br />
<?php _e( 'If you have an alternate feed address, such as one from <a href="http://feedburner.com" title="Feedburner">Feedburner</a>, you can enter it here to have the theme redirect your feed links.', $domain ); ?><br /><br />
- <input id="feeds_redirect" name="feeds_redirect" type="checkbox" <?php if ( hybrid_get_setting( 'feeds_redirect' ) ) echo 'checked="checked"'; ?> value="true" />
+ <input id="feeds_redirect" name="feeds_redirect" type="checkbox" <?php if ( hybrid_get_setting( 'feeds_redirect' ) ) echo 'checked="checked"'; ?> value="true" />
<label for="feeds_redirect"><?php _e( 'Direct category, tag, search, and author feeds to your alternate feed address?', $domain ); ?></label>
</td>
</tr>
<tr>
<th><label for="seo_plugin"><acronym title="<?php _e( 'Search Engine Optimization', $domain ); ?>"><?php _e( 'SEO:', $domain ); ?></acronym></label></th>
<td>
- <input id="seo_plugin" name="seo_plugin" type="checkbox" <?php if ( hybrid_get_setting( 'seo_plugin' ) ) echo 'checked="checked"'; ?> value="true" />
+ <input id="seo_plugin" name="seo_plugin" type="checkbox" <?php if ( hybrid_get_setting( 'seo_plugin' ) ) echo 'checked="checked"'; ?> value="true" />
<label for="seo_plugin"><?php _e( 'Are you using an <acronym title="Search Engine Optimization">SEO</acronym> plugin? Select this to disable the theme\'s meta and indexing features.', $domain ); ?></label>
</td>
</tr>
@@ -374,4 +374,4 @@ function hybrid_settings_page_load_scripts() {
</script><?php
}
-?>
\ No newline at end of file
+?>
diff --git a/wp-content/themes/thematic/footer.php b/wp-content/themes/thematic/footer.php
index c86c081a..e6ae1ff3 100644
--- a/wp-content/themes/thematic/footer.php
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment