<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15517] trunk/wp-admin/includes: Make deprecated functions work.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15517">15517</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-21 18:08:42 +0000 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make deprecated functions work. See <a href="http://trac.wordpress.org/ticket/14651">#14651</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesadminphp">trunk/wp-admin/includes/admin.php</a></li>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpadminincludeslisttablephp">trunk/wp-admin/includes/list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/admin.php (15516 => 15517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/admin.php 2010-08-21 16:56:24 UTC (rev 15516)
+++ trunk/wp-admin/includes/admin.php 2010-08-21 18:08:42 UTC (rev 15517)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx"> /** WordPress Template Administration API */
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/template.php');
</span><span class="cx">
</span><ins>+/** WordPress List Table Administration API */
+require_once(ABSPATH . 'wp-admin/includes/list-table.php');
+
</ins><span class="cx"> /** WordPress Theme Administration API */
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/includes/theme.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15516 => 15517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-21 16:56:24 UTC (rev 15516)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-21 18:08:42 UTC (rev 15517)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-require_once('list-table.php');
-
</del><span class="cx"> /**
</span><span class="cx"> * List table classes
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (15516 => 15517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2010-08-21 16:56:24 UTC (rev 15516)
+++ trunk/wp-admin/includes/deprecated.php 2010-08-21 18:08:42 UTC (rev 15517)
</span><span class="lines">@@ -203,31 +203,94 @@
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> * @deprecated 3.1.0
</span><span class="cx"> * @deprecated Use WP_List_Table
</span><ins>+ *
+ * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
+ * @param array $columns An array of columns with column IDs as the keys and translated column names as the values
+ * @see get_column_headers(), print_column_headers(), get_hidden_columns()
</ins><span class="cx"> */
</span><del>-function register_column_headers() {
</del><ins>+function register_column_headers($screen, $columns) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
</span><ins>+
+ global $_wp_column_headers;
+
+ if ( is_string($screen) )
+ $screen = convert_to_screen($screen);
+
+ if ( !isset($_wp_column_headers) )
+ $_wp_column_headers = array();
+
+ $_wp_column_headers[$screen->id] = $columns;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get the column headers for a screen
+ *
+ * @since 2.7.0
+ * @deprecated 3.1.0
+ * @deprecated Use WP_List_Table
+ *
+ * @param string|object $screen The screen you want the headers for
+ * @return array Containing the headers in the format id => UI String
+ */
+function get_column_headers($screen) {
+ _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
+
+ $table = new _WP_List_Table_Compat($screen);
+ list( $columns ) = $table->get_column_headers();
+
+ return $columns;
+}
+
+/**
</ins><span class="cx"> * Prints column headers for a particular screen.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> * @deprecated 3.1.0
</span><span class="cx"> * @deprecated Use WP_List_Table
</span><span class="cx"> */
</span><del>-function print_column_headers() {
</del><ins>+function print_column_headers($screen, $id = true) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
</span><ins>+
+ $table = new _WP_List_Table_Compat($screen);
+
+ $table->print_column_headers($id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Gets hidden column names for a particular screen.
</span><span class="cx"> *
</span><del>- * @since unknown
</del><ins>+ * @since 2.7.0
</ins><span class="cx"> * @deprecated 3.1.0
</span><span class="cx"> * @deprecated Use WP_List_Table
</span><ins>+ *
+ * @param string $screen
+ * @return array
</ins><span class="cx"> */
</span><del>-function get_hidden_columns() {
</del><ins>+function get_hidden_columns($screen) {
</ins><span class="cx"> _deprecated_function( __FUNCTION__, '3.1', 'WP_List_Table' );
</span><del>- return array();
</del><ins>+
+ $table = new _WP_List_Table_Compat($screen);
+
+ return $table->get_hidden_columns();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+// Helper class to be used only by deprecated functions
+class _WP_List_Table_Compat extends WP_List_Table {
+
+ function _WP_List_Table_Compat( $screen) {
+ parent::WP_List_Table( array(
+ 'screen' => $screen,
+ 'ajax' => false
+ ) );
+ }
+
+ function get_columns() {
+ global $_wp_column_headers;
+
+ if ( isset($_wp_column_headers[$this->_screen->id]) )
+ return $_wp_column_headers[$this->_screen->id];
+
+ return array();
+ }
+}
+
</ins></span></pre></div>
<a id="trunkwpadminincludeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table.php (15516 => 15517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table.php 2010-08-21 16:56:24 UTC (rev 15516)
+++ trunk/wp-admin/includes/list-table.php 2010-08-21 18:08:42 UTC (rev 15517)
</span><span class="lines">@@ -458,6 +458,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @access protected
</span><ins>+ *
+ * @param bool $with_id Wether to set the id attribute or not
</ins><span class="cx"> */
</span><span class="cx"> function print_column_headers( $with_id = true ) {
</span><span class="cx"> $screen = $this->_screen;
</span></span></pre>
</div>
</div>
</body>
</html>