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

Remove changing media folder from theme activation

Browse Source
This commit is contained in:
Ben Word
2013-12-29 14:10:41 -06:00
parent c79e67ddcf
commit d581900fe8
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,4 +1,5 @@
### HEAD
* Remove changing media folder from theme activation (use [Bedrock](https://github.com/roots/bedrock) for clean URLs out of the box)
* Update to Bootstrap 3.0.3
* Switch `div.main` to `main` element now that Modernizr uses the latest HTML5 Shiv
* Update to Modernizr 2.7.0

24
lib/activation.php
View File

@@ -85,19 +85,6 @@ function roots_theme_activation_options_render_page() { ?>
</td>
</tr>
<tr valign="top"><th scope="row"><?php _e('Change uploads folder?', 'roots'); ?></th>
<td>
<fieldset><legend class="screen-reader-text"><span><?php _e('Update uploads folder?', 'roots'); ?></span></legend>
<select name="roots_theme_activation_options[change_uploads_folder]" id="change_uploads_folder">
<option selected="selected" value="true"><?php echo _e('Yes', 'roots'); ?></option>
<option value="false"><?php echo _e('No', 'roots'); ?></option>
</select>
<br>
<small class="description"><?php printf(__('Change uploads folder to /media/ instead of /wp-content/uploads/', 'roots')); ?></small>
</fieldset>
</td>
</tr>
<tr valign="top"><th scope="row"><?php _e('Create navigation menu?', 'roots'); ?></th>
<td>
<fieldset><legend class="screen-reader-text"><span><?php _e('Create navigation menu?', 'roots'); ?></span></legend>
@@ -186,17 +173,6 @@ function roots_theme_activation_action() {
}
}
if ($roots_theme_activation_options['change_uploads_folder'] === 'true') {
$roots_theme_activation_options['change_uploads_folder'] = false;
update_option('uploads_use_yearmonth_folders', 0);
if (!is_multisite()) {
update_option('upload_path', 'media');
} else {
update_option('upload_path', '');
}
}
if ($roots_theme_activation_options['create_navigation_menus'] === 'true') {
$roots_theme_activation_options['create_navigation_menus'] = false;