WordPress 3.7.1

[autoinstalls/wordpress.git] / wp-admin / options.php

diff --git a/wp-admin/options.php b/wp-admin/options.php
index 80a07190df4b8eea0ec8bb477c1483b0a46ef76f..00fb3c0fe53fb02383e368585922229a71397b68 100644 (file)
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -16,7 +16,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 $title = __('Settings');
 $this_file = 'options.php';
 
 $title = __('Settings');
 $this_file = 'options.php';


@@ -29,6 +29,17 @@ $capability = 'manage_options';
 if ( empty($option_page) ) // This is for back compat and will eventually be removed.
        $option_page = 'options';
 else
 if ( empty($option_page) ) // This is for back compat and will eventually be removed.
        $option_page = 'options';
 else

+
+       /**
+        * Filter the capability required when using the Settings API.
+        *
+        * By default, the options groups for all registered settings require the manage_options capability.
+        * This filter is required to change the capability required for a certain options page.
+        *
+        * @since 3.2.0
+        *
+        * @param string $capability The capability used for the page, which is manage_options by default.
+        */

        $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
 
 if ( !current_user_can( $capability ) )
        $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
 
 if ( !current_user_can( $capability ) )


@@ -96,10 +107,24 @@ if ( !is_multisite() ) {
        $whitelist_options['general'][] = 'new_admin_email';
        $whitelist_options['general'][] = 'WPLANG';
 
        $whitelist_options['general'][] = 'new_admin_email';
        $whitelist_options['general'][] = 'WPLANG';
 

+       /**
+        * Toggle post-by-email functionality.
+        *
+        * @since 3.0.0
+        *
+        * @param bool True or false, based on whether post-by-email configuration is enabled or not.
+        */

        if ( apply_filters( 'enable_post_by_email_configuration', true ) )
                $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 
        if ( apply_filters( 'enable_post_by_email_configuration', true ) )
                $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 

+/**
+ * Filter the options white list.
+ *
+ * @since 2.7.0
+ *
+ * @param array White list options.
+ */

 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
 
 /*
 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
 
 /*


@@ -172,7 +197,7 @@ if ( 'update' == $action ) {
        exit;
 }
 
        exit;
 }
 

-include('./admin-header.php'); ?>
+include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

 
 <div class="wrap">
 <?php screen_icon(); ?>
 
 <div class="wrap">
 <?php screen_icon(); ?>


@@ -228,4 +253,4 @@ endforeach;
 </div>
 
 <?php
 </div>
 
 <?php

-include('./admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );