Changeset 18858

Timestamp:

10/01/2011 06:07:41 PM (13 years ago)

Author:

nacin

Message:

Deprecate secreen_options(), screen_layout(). see #18785.

Location:

trunk/wp-admin/includes

Files:

• deprecated.php (modified) (2 diffs)
• screen.php (modified) (2 diffs)

trunk/wp-admin/includes/deprecated.php

@@ -704 +704 @@
 
 /**
- * @since 2.7
+ * @since 2.7.0
  * @deprecated 3.3
- * @deprecated Use wp_editor().
+ * @deprecated Use wp_editor()
  * @see wp_editor()
  */
@@ -715 +715 @@
 }
 
-// see WP_Editor for the next 4
+/**
+ * @deprecated 3.3.0
+ * @deprecated Use wp_editor()
+ * @see wp_editor()
+ */
 function wp_preload_dialogs() {
-    _deprecated_function( __FUNCTION__, '3.3' );
-}
-
+    _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+}
+
+/**
+ * @deprecated 3.3.0
+ * @deprecated Use wp_editor()
+ * @see wp_editor()
+ */
 function wp_print_editor_js() {
-    _deprecated_function( __FUNCTION__, '3.3' );
-}
-
+    _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+}
+
+/**
+ * @deprecated 3.3.0
+ * @deprecated Use wp_editor()
+ * @see wp_editor()
+ */
 function wp_quicktags() {
-    _deprecated_function( __FUNCTION__, '3.3' );
-}
-
+    _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+}
+
+/**
+ * @deprecated 3.3.0
+ * @deprecated Use wp_editor()
+ * @see wp_editor()
+ */
 function wp_fullscreen_html() {
-    _deprecated_function( __FUNCTION__, '3.3' );
-}
-
+    _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+}
+
+/**
+ * Returns the screen layout options.
+ *
+ * @since unknown
+ * @deprecated 3.3.0
+ * @deprecated Use $current_screen->render_screen_layout()
+ * @see WP_Screen::render_screen_layout()
+ */
+function screen_layout( $screen ) {
+    _deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_screen_layout()' );
+
+    $current_screen = get_current_screen();
+
+    if ( ! $current_screen )
+        return '';
+
+    ob_start();
+    $current_screen->render_screen_layout();
+    return ob_get_clean();
+}
+
+/**
+ * Returns the screen's per-page options.
+ *
+ * @since unknown
+ * @deprecated 3.3.0
+ * @deprecated Use $current_screen->render_per_page_options()
+ * @see WP_Screen::render_per_page_options()
+ */
+function screen_options( $screen ) {
+    _deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_per_page_options()' );
+
+    $current_screen = get_current_screen();
+
+    if ( ! $current_screen )
+        return '';
+
+    ob_start();
+    $current_screen->render_per_page_options();
+    return ob_get_clean();
+}

trunk/wp-admin/includes/screen.php

@@ -267 +267 @@
 
 /**
- * Returns the screen layout options.
- *
- * @todo: deprecate?
- */
-function screen_layout($screen) {
-    $current_screen = get_current_screen();
-
-    if ( ! $current_screen )
-        return '';
-
-    ob_start();
-    $current_screen->render_screen_layout();
-    $screen_layout = ob_get_clean();
-
-    return $screen_layout;
-}
-
-/**
  * Register and configure an admin screen option
  *
@@ -300 +282 @@
 
     return $current_screen->add_option( $option, $args );
-}
-
-
-/**
- * Returns the screen's per-page options.
- *
- * @todo: deprecate?
- */
-function screen_options($screen) {
-    $current_screen = get_current_screen();
-
-    if ( ! $current_screen )
-        return '';
-
-    ob_start();
-    $current_screen->render_per_page_options();
-    $per_page_options = ob_get_clean();
-
-    return $per_page_options;
 }