X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-admin/custom-background.php
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 8fb1399b..a23efda0 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -22,7 +22,7 @@ class Custom_Background {
* @since 3.0.0
* @access private
*/
- var $admin_header_callback;
+ private $admin_header_callback;
/**
* Callback for header div.
@@ -31,7 +31,7 @@ class Custom_Background {
* @since 3.0.0
* @access private
*/
- var $admin_image_div_callback;
+ private $admin_image_div_callback;
/**
* Holds the page menu hook.
@@ -40,7 +40,7 @@ class Custom_Background {
* @since 3.0.0
* @access private
*/
- var $page = '';
+ private $page = '';
/**
* Constructor - Register administration header callback.
@@ -50,7 +50,7 @@ class Custom_Background {
* @param callback $admin_image_div_callback Optional custom image div output callback.
* @return Custom_Background
*/
- function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
+ public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
$this->admin_header_callback = $admin_header_callback;
$this->admin_image_div_callback = $admin_image_div_callback;
@@ -58,26 +58,72 @@ class Custom_Background {
add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
}
+ /**
+ * Make private properties readable for backwards compatibility.
+ *
+ * @since 4.0.0
+ * @access public
+ *
+ * @param string $name Property name.
+ * @return mixed Property.
+ */
+ public function __get( $name ) {
+ return $this->$name;
+ }
+
+ /**
+ * Make private properties settable for backwards compatibility.
+ *
+ * @since 4.0.0
+ * @access public
+ *
+ * @param string $name Property to set.
+ * @param mixed $value Property value.
+ * @return mixed Newly-set property.
+ */
+ public function __set( $name, $value ) {
+ return $this->$name = $value;
+ }
+
+ /**
+ * Make private properties checkable for backwards compatibility.
+ *
+ * @since 4.0.0
+ * @access public
+ *
+ * @param string $name Property to check if set.
+ * @return bool Whether the property is set.
+ */
+ public function __isset( $name ) {
+ return isset( $this->$name );
+ }
+
+ /**
+ * Make private properties un-settable for backwards compatibility.
+ *
+ * @since 4.0.0
+ * @access public
+ *
+ * @param string $name Property to unset.
+ */
+ public function __unset( $name ) {
+ unset( $this->$name );
+ }
+
/**
* Set up the hooks for the Custom Background admin page.
*
* @since 3.0.0
*/
- function init() {
+ public function init() {
if ( ! current_user_can('edit_theme_options') )
return;
- $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page'));
+ $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
- add_action("load-$page", array(&$this, 'admin_load'));
- add_action("load-$page", array(&$this, 'take_action'), 49);
- add_action("load-$page", array(&$this, 'handle_upload'), 49);
-
- if ( isset( $_REQUEST['context'] ) && $_REQUEST['context'] == 'custom-background' ) {
- add_filter( 'attachment_fields_to_edit', array( $this, 'attachment_fields_to_edit' ), 10, 2 );
- add_filter( 'media_upload_tabs', array( $this, 'filter_upload_tabs' ) );
- add_filter( 'media_upload_mime_type_links', '__return_empty_array' );
- }
+ add_action("load-$page", array($this, 'admin_load'));
+ add_action("load-$page", array($this, 'take_action'), 49);
+ add_action("load-$page", array($this, 'handle_upload'), 49);
if ( $this->admin_header_callback )
add_action("admin_head-$page", $this->admin_header_callback, 51);
@@ -88,27 +134,26 @@ class Custom_Background {
*
* @since 3.0.0
*/
- function admin_load() {
+ public function admin_load() {
get_current_screen()->add_help_tab( array(
'id' => 'overview',
'title' => __('Overview'),
'content' =>
'' . __( 'You can customize the look of your site without touching any of your theme’s code by using a custom background. Your background can be an image or a color.' ) . '
' .
- '' . __( 'To use a background image, simply upload it, then choose your display options below. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '
' .
- '' . __( 'You can also choose a background color. If you know the hexadecimal code for the color you want, enter it in the Background Color field. If not, click on the Select a Color link, and a color picker will allow you to choose the exact shade you want.' ) . '
' .
+ '' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the “Choose Image” button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '
' .
+ '' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. “#ff0000” for red, or by choosing a color using the color picker.' ) . '
' .
'' . __( 'Don’t forget to click on the Save Changes button when you are finished.' ) . '
'
) );
get_current_screen()->set_help_sidebar(
'' . __( 'For more information:' ) . '
' .
'' . __( 'Documentation on Custom Background' ) . '
' .
- '' . __( 'Support Forums' ) . '
'
+ '' . __( 'Support Forums' ) . '
'
);
- add_thickbox();
- wp_enqueue_script('media-upload');
+ wp_enqueue_media();
wp_enqueue_script('custom-background');
- wp_enqueue_style('farbtastic');
+ wp_enqueue_style('wp-color-picker');
}
/**
@@ -116,7 +161,7 @@ class Custom_Background {
*
* @since 3.0.0
*/
- function take_action() {
+ public function take_action() {
if ( empty($_POST) )
return;
@@ -183,50 +228,53 @@ class Custom_Background {
*
* @since 3.0.0
*/
- function admin_page() {
+ public function admin_page() {
?>
-
-
-updated) ) { ?>
+
+
+updated ) ) { ?>
Visit your site to see how it looks.' ), home_url( '/' ) ); ?>
-
+
+
- if ( $this->admin_image_div_callback ) {
- call_user_func($this->admin_image_div_callback);
- } else {
-?>
-