<!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>[13268] trunk: Trim trailing whites</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13268">13268</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-21 00:03:42 +0000 (Sun, 21 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trim trailing whites</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmincsscustomnavigationdevcss">trunk/wp-admin/css/custom-navigation.dev.css</a></li>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminjscustomnavigationdefaultitemsdevjs">trunk/wp-admin/js/custom-navigation-default-items.dev.js</a></li>
<li><a href="#trunkwpadminjscustomnavigationdynamicfunctionsdevjs">trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js</a></li>
<li><a href="#trunkwpadminjscustomnavigationphpfunctionsdevjs">trunk/wp-admin/js/custom-navigation-php-functions.dev.js</a></li>
<li><a href="#trunkwpadminjstagsdevjs">trunk/wp-admin/js/tags.dev.js</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescustomnavigationphp">trunk/wp-includes/custom-navigation.php</a></li>
<li><a href="#trunkwpincludesdefaultwidgetsphp">trunk/wp-includes/default-widgets.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeshttpphp">trunk/wp-includes/http.php</a></li>
<li><a href="#trunkwpincludesmsdefaultconstantsphp">trunk/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludestemplateloaderphp">trunk/wp-includes/template-loader.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/comment.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> wp_set_comment_status( $comment_id, 'hold' );
</span><span class="cx"> $redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
</span><span class="cx"> break;
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> wp_redirect( $redir );
</span><span class="cx"> die;
</span></span></pre></div>
<a id="trunkwpadmincsscustomnavigationdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/custom-navigation.dev.css (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/custom-navigation.dev.css 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/css/custom-navigation.dev.css 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> .fix{clear: both;height: 1px;margin: -1px 0 0;overflow: hidden;}
</span><span class="cx">
</span><span class="cx"> #no-js {display:block;}
</span></span></pre></div>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/custom-navigation.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><span class="cx"> wp_admin_css( 'custom-navigation' );
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx">
</span><span class="cx"> function wp_custom_nav_reset() {
</span><span class="cx"> wp_custom_navigation_setup(true);
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -46,20 +46,20 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <div id="no-js"><h3>You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.</h3></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> $messagesdiv = '';
</span><span class="cx"> $menu_id_in_edit = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get the theme name
</span><span class="cx"> $themename = get_current_theme();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Check which menu is selected and if menu is in edit already
</span><span class="cx"> if ( isset( $_POST['switch_menu'] ) )
</span><span class="cx"> $menu_selected_id = $_POST['menu_select'];
</span><span class="cx"> elseif ( isset( $_POST['menu_id_in_edit'] ) )
</span><span class="cx"> $menu_selected_id = $_POST['menu_id_in_edit'];
</span><del>-
</del><ins>+
</ins><span class="cx"> // Default Menu to show
</span><span class="cx"> $custom_menus = get_terms( 'menu', array( 'hide_empty' => false ) );
</span><span class="cx"> if ( !empty( $custom_menus ) )
</span><span class="lines">@@ -74,12 +74,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $_POST['set_wp_menu'] ) ) {
</span><span class="cx"> update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
</span><span class="cx"> $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been updated!</p></div>';
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> if ( isset( $_POST['licount'] ) )
</span><span class="cx"> $postCounter = $_POST['licount'];
</span><span class="cx"> else
</span><span class="lines">@@ -93,13 +93,13 @@
</span><span class="cx"> $existing_term = get_term_by( 'name', $insert_menu_name, 'menu' );
</span><span class="cx"> if ( $existing_term ) {
</span><span class="cx"> $messagesdiv = '<div id="message" class="error fade below-h2"><p>'.$insert_menu_name.' Menu has already created - please try another name</p></div>';
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx"> $term = wp_insert_term( $insert_menu_name, 'menu' );
</span><span class="cx"> if ( $term ) {
</span><span class="cx"> $custom_menus[$term['term_id']] = $term;
</span><span class="cx"> $menu_selected_id = $term['term_id'];
</span><span class="cx"> $menu_id_in_edit = $menu_selected_id;
</span><del>- $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$insert_menu_name.' Menu has been created!</p></div>';
</del><ins>+ $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$insert_menu_name.' Menu has been created!</p></div>';
</ins><span class="cx">
</span><span class="cx"> $postCounter = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -108,8 +108,8 @@
</span><span class="cx"> $messagesdiv = '<div id="message" class="error fade below-h2"><p>Please enter a valid Menu name</p></div>';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- if ( isset($_POST['reset_wp_menu']) ) {
</del><ins>+
+ if ( isset($_POST['reset_wp_menu']) ) {
</ins><span class="cx"> $success = wp_custom_nav_reset();
</span><span class="cx"> if ($success) {
</span><span class="cx"> // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> $update_fields = array( 'menu_order', 'guid', 'post_content', 'post_title', 'post_excerpt', 'post_content_filtered' );
</span><span class="cx"> //Loop through all POST variables
</span><span class="cx"> for ($k = 1;$k<= $postCounter; $k++) {
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($_POST['dbid'.$k])) { $db_id = $_POST['dbid'.$k]; } else { $db_id = 0; }
</span><span class="cx"> if (isset($_POST['postmenu'.$k])) { $post_id = $_POST['postmenu'.$k]; } else { $post_id = 0; }
</span><span class="cx"> //@todo implement heirarchy
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> if (isset($_POST['linktype'.$k])) { $linktype = $_POST['linktype'.$k]; } else { $linktype = 'custom'; }
</span><span class="cx"> if (isset($_POST['anchortitle'.$k])) { $custom_anchor_title = stripslashes($_POST['anchortitle'.$k]); } else { $custom_anchor_title = $custom_title; }
</span><span class="cx"> if (isset($_POST['newwindow'.$k])) { $new_window = $_POST['newwindow'.$k]; } else { $new_window = 0; }
</span><del>-
</del><ins>+
</ins><span class="cx"> $post = array( 'post_status' => 'publish', 'post_type' => 'menu_item', 'post_author' => $user_ID,
</span><span class="cx"> 'ping_status' => 0, 'post_parent' => $post_id, '`menu_order' => $position,
</span><span class="cx"> 'guid' => $custom_linkurl, 'post_excerpt' => $custom_anchor_title, 'tax_input' => array( 'menu' => $menu_title ),
</span><span class="lines">@@ -175,43 +175,43 @@
</span><span class="cx"> //DISPLAY SUCCESS MESSAGE IF POST CORRECT
</span><span class="cx"> $messagesdiv = '<div id="message" class="updated fade below-h2"><p>'.$themename.'s Custom Menu has been updated!</p></div>';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //DISPLAY Custom Navigation
</span><span class="cx"> ?>
</span><span class="cx"> <div id="pages-left">
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <h2 class="maintitle">Custom Navigation</h2>
</span><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //CHECK if custom menu has been enabled
</span><span class="cx"> $enabled_menu = get_option('wp_custom_nav_menu');
</span><span class="cx"> $checked = strtolower($enabled_menu);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($checked == 'true') {
</span><span class="cx"> } else {
</span><span class="cx"> echo '<div id="message-enabled" class="error fade below-h2"><p><strong>The Custom Menu has not been Enabled yet. Please enable it in order to use it --------></strong></p></div>';
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> ?>
</span><span class="cx"> <?php echo $messagesdiv; ?>
</span><span class="cx"> <form onsubmit="updatepostdata()" action="custom-navigation.php" method="post" enctype="multipart/form-data">
</span><del>-
</del><ins>+
</ins><span class="cx"> <input type="hidden" name="licount" id="licount" value="0" />
</span><span class="cx"> <input type="hidden" name="menu_id_in_edit" id="menu_id_in_edit" value="<?php echo $menu_selected_id; ?>" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="sidebar-name">
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="sidebar-name-arrow">
</span><span class="cx"> <br/>
</span><span class="cx"> </div>
</span><span class="cx"> <h3><?php echo $menu_title; ?></h3>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="nav-container">
</span><span class="cx"> <ul id="custom-nav">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> //DISPLAY existing menu
</span><span class="cx"> if ( $menu_selected_id > 0 ) {
</span><span class="lines">@@ -219,59 +219,59 @@
</span><span class="cx"> $output_type = "backend";
</span><span class="cx"> //MAIN OUTPUT FUNCTION
</span><span class="cx"> wp_custom_navigation_output( 'type='.$output_type.'&name='.$menu_title.'&id='.$menu_selected_id );
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- /#nav-container -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <p class="submit">
</span><del>-
</del><ins>+
</ins><span class="cx"> <script type="text/javascript">
</span><del>- updatepostdata();
</del><ins>+ updatepostdata();
</ins><span class="cx"> </script>
</span><del>-
</del><ins>+
</ins><span class="cx"> <input id="save_bottom" name="save_bottom" type="submit" value="Save All Changes" /></p>
</span><span class="cx"> </div><!-- /.inside -->
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="menu-right">
</span><del>-
</del><ins>+
</ins><span class="cx"> <h2 class="heading">Options</h2>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="cx"> <h3>Setup Custom Menu</h3>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //SETUP Custom Menu
</span><del>-
</del><ins>+
</ins><span class="cx"> $enabled_menu = get_option('wp_custom_nav_menu');
</span><del>-
</del><ins>+
</ins><span class="cx"> $checked = strtolower($enabled_menu);
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span >
</span><span class="cx"> <label>Enable</label><input type="radio" name="enable_wp_menu" value="true" <?php if ($checked=='true') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>Disable</label><input type="radio" name="enable_wp_menu" value="false" <?php if ($checked=='true') { } else { echo 'checked="checked"'; } ?> />
</span><del>- </span><!-- /.checkboxes -->
-
</del><ins>+ </span><!-- /.checkboxes -->
+
</ins><span class="cx"> <input id="set_wp_menu" type="submit" value="Set Menu" name="set_wp_menu" class="button" /><br />
</span><del>-
</del><ins>+
</ins><span class="cx"> <span>
</span><span class="cx"> <label>Reset Menu to Default</label>
</span><span class="cx"> <input id="reset_wp_menu" type="submit" value="Reset" name="reset_wp_menu" class="button" onclick="return confirm('Are you sure you want to RESET the Custom Navigation Menu to its Default Settings?');" />
</span><span class="cx"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="fix"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="lines">@@ -279,8 +279,8 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><span class="cx"> <select id="menu_select" name="menu_select">
</span><del>- <?php
-
</del><ins>+ <?php
+
</ins><span class="cx"> //DISPLAY SELECT OPTIONS
</span><span class="cx"> foreach( $custom_menus as $menu ) {
</span><span class="cx"> $menu_term = get_term( $menu, 'menu' );
</span><span class="lines">@@ -291,15 +291,15 @@
</span><span class="cx"> ?>
</span><span class="cx"> <option value="<?php echo $menu_term->term_id; ?>" <?php echo $selected_option; ?>><?php echo $menu_term->name; ?></option>
</span><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><del>-
</del><ins>+
</ins><span class="cx"> <input id="switch_menu" type="submit" value="Switch" name="switch_menu" class="button" />
</span><span class="cx"> <input id="add_menu_name" name="add_menu_name" type="text" value="" />
</span><span class="cx"> <input id="add_menu" type="submit" value="Add Menu" name="add_menu" class="button" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="fix"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><span class="lines">@@ -309,25 +309,25 @@
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="cx"> <h3>Top Level Menu Descriptions</h3>
</span><span class="cx"> </div>
</span><del>- <div class="widget-holder">
</del><ins>+ <div class="widget-holder">
</ins><span class="cx"> <span>Display Descriptions in Top Level Menu?</span>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //UPDATE and DISPLAY Menu Description Option
</span><span class="cx"> if (isset($_POST['menu-descriptions']))
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($_POST['switch_menu'])) {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> $menu_options_to_edit = $_POST['menu_id_in_edit'];
</span><del>- update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
</del><ins>+ update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($menu_id_in_edit > 0)
</span><span class="cx"> {
</span><span class="cx"> $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
</span><span class="lines">@@ -335,16 +335,16 @@
</span><span class="cx"> else {
</span><span class="cx"> $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $checked = strtolower($checkedraw);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($advanced_option_descriptions == 'no')
</span><span class="cx"> {
</span><span class="cx"> $checked = 'no';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class="checkboxes">
</span><span class="cx"> <label>Yes</label><input type="radio" name="menu-descriptions" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>No</label><input type="radio" name="menu-descriptions" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</span><span class="lines">@@ -353,16 +353,16 @@
</span><span class="cx"> <div class="fix"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="cx"> <h3>Add an Existing Page</h3>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> $pages_args = array(
</span><span class="cx"> 'child_of' => 0,
</span><span class="cx"> 'sort_order' => 'ASC',
</span><span class="lines">@@ -377,8 +377,8 @@
</span><span class="cx"> 'exclude_tree' => '',
</span><span class="cx"> 'number' => '',
</span><span class="cx"> 'offset' => 0 );
</span><del>-
- //GET all pages
</del><ins>+
+ //GET all pages
</ins><span class="cx"> $pages_array = get_pages($pages_args);
</span><span class="cx"> $page_name = '';
</span><span class="cx"> //CHECK if pages exist
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> {
</span><span class="cx"> foreach ($pages_array as $post)
</span><span class="cx"> {
</span><del>- //Add page name to
</del><ins>+ //Add page name to
</ins><span class="cx"> $page_name .= htmlentities($post->post_title).'|';
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -394,43 +394,43 @@
</span><span class="cx"> {
</span><span class="cx"> $page_name = "No pages available";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <script>
</span><span class="cx"> jQuery(document).ready(function(){
</span><span class="cx">
</span><span class="cx"> //GET PHP pages
</span><span class="cx"> var dataposts = "<?php echo $page_name; ?>".split("|");
</span><del>-
</del><ins>+
</ins><span class="cx"> //Set autocomplete
</span><span class="cx"> jQuery("#page-search").autocomplete(dataposts);
</span><del>-
</del><ins>+
</ins><span class="cx"> //Handle autocomplete result
</span><span class="cx"> jQuery("#page-search").result(function(event, data, formatted) {
</span><span class="cx"> jQuery('#existing-pages').css('display','block');
</span><span class="cx"> jQuery("#existing-pages dt:contains('" + data + "')").css("display", "block");
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#show-pages').hide();
</span><span class="cx"> jQuery('#hide-pages').show();
</span><del>-
</del><ins>+
</ins><span class="cx"> });
</span><span class="cx"> jQuery('#existing-pages').css('display','none');
</span><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx">
</span><del>- <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="Search Pages" />
-
- <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
</del><ins>+ <input type="text" onfocus="jQuery('#page-search').attr('value','');" id="page-search" value="Search Pages" />
+
+ <a id="show-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','block');jQuery('#page-search').attr('value','');jQuery('#existing-pages dt').css('display','block');jQuery('#show-pages').hide();jQuery('#hide-pages').show();">View All</a>
</ins><span class="cx"> <a id="hide-pages" style="cursor:pointer;" onclick="jQuery('#existing-pages').css('display','none');jQuery('#page-search').attr('value','Search Pages');jQuery('#existing-pages dt').css('display','none');jQuery('#show-pages').show();jQuery('#hide-pages').hide();">Hide All</a>
</span><del>-
</del><ins>+
</ins><span class="cx"> <script type="text/javascript">
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#hide-pages').hide();
</span><del>-
</del><ins>+
</ins><span class="cx"> </script>
</span><del>-
</del><ins>+
</ins><span class="cx"> <ul id="existing-pages" class="list">
</span><span class="cx"> <?php
</span><span class="cx"> $intCounter = 0;
</span><span class="lines">@@ -438,40 +438,40 @@
</span><span class="cx"> $intCounter = wp_custom_nav_get_pages($intCounter,'default');
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="fix"></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="cx"> <h3>Add an Existing Category</h3>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="widget-holder">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //Custom GET categories query
</span><span class="cx"> $categories = $wpdb->get_results("SELECT term_id FROM $wpdb->term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC");
</span><span class="cx"> $cat_name = '';
</span><span class="cx"> //CHECK for results
</span><span class="cx"> if ($categories)
</span><span class="cx"> {
</span><del>- foreach($categories as $category)
- {
</del><ins>+ foreach($categories as $category)
+ {
</ins><span class="cx"> $cat_id = $category->term_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> $cat_args=array(
</span><span class="cx"> 'orderby' => 'name',
</span><span class="cx"> 'include' => $cat_id,
</span><span class="cx"> 'hierarchical' => 1,
</span><span class="cx"> 'order' => 'ASC'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $category_names=get_categories($cat_args);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($category_names[0]->name))
</span><span class="cx"> {
</span><span class="cx"> //Add category name to data string
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> {
</span><span class="cx"> $cat_name = "No categories available";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <script>
</span><span class="lines">@@ -491,48 +491,48 @@
</span><span class="cx">
</span><span class="cx"> //GET PHP categories
</span><span class="cx"> var datacats = "<?php echo $cat_name; ?>".split("|");
</span><del>-
</del><ins>+
</ins><span class="cx"> //Set autocomplete
</span><span class="cx"> jQuery("#cat-search").autocomplete(datacats);
</span><del>-
</del><ins>+
</ins><span class="cx"> //Handle autocomplete result
</span><span class="cx"> jQuery("#cat-search").result(function(event, data, formatted) {
</span><span class="cx"> jQuery('#existing-categories').css('display','block');
</span><span class="cx"> jQuery("#existing-categories dt:contains('" + data + "')").css("display", "block");
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#show-cats').hide();
</span><span class="cx"> jQuery('#hide-cats').show();
</span><del>-
</del><ins>+
</ins><span class="cx"> });
</span><span class="cx"> jQuery('#existing-categories').css('display','none');
</span><del>-
</del><ins>+
</ins><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx">
</span><del>- <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="Search Categories" />
-
- <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
</del><ins>+ <input type="text" onfocus="jQuery('#cat-search').attr('value','');" id="cat-search" value="Search Categories" />
+
+ <a id="show-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','block');jQuery('#cat-search').attr('value','');jQuery('#existing-categories dt').css('display','block');jQuery('#show-cats').hide();jQuery('#hide-cats').show();">View All</a>
</ins><span class="cx"> <a id="hide-cats" style="cursor:pointer;" onclick="jQuery('#existing-categories').css('display','none');jQuery('#cat-search').attr('value','Search Categories');jQuery('#existing-categories dt').css('display','none');jQuery('#show-cats').show();jQuery('#hide-cats').hide();">Hide All</a>
</span><del>-
</del><ins>+
</ins><span class="cx"> <script type="text/javascript">
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#hide-cats').hide();
</span><del>-
</del><ins>+
</ins><span class="cx"> </script>
</span><del>-
</del><ins>+
</ins><span class="cx"> <ul id="existing-categories" class="list">
</span><span class="cx"> <?php
</span><span class="cx"> //Get default Categories
</span><del>- $intCounter = wp_custom_nav_get_categories($intCounter,'default');
</del><ins>+ $intCounter = wp_custom_nav_get_categories($intCounter,'default');
</ins><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="fix"></div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widgets-holder-wrap">
</span><span class="cx"> <div class="sidebar-name">
</span><span class="cx"> <div class="sidebar-name-arrow"></div>
</span><span class="lines">@@ -551,16 +551,16 @@
</span><span class="cx"> <div class="fix"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- /.widgets-holder-wrap -->
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx"> document.getElementById('pages-left').style.display='block';
</span><span class="cx"> document.getElementById('menu-right').style.display='block';
</span><span class="cx"> document.getElementById('no-js').style.display='none';
</span><span class="cx"> </script>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="dialog-confirm" title="Edit Menu Item">
</span><span class="cx"> </label><input id="edittitle" type="text" name="edittitle" value="" /><label class="editlabel" for="edittitle">Menu Title</label><br />
</span><span class="cx"> <input id="editlink" type="text" name="editlink" value="" /><label class="editlabel" for="editlink">URL</label><br />
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/edit-tags.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> if ( 'post_tag' == $taxonomy ) {
</span><span class="cx"> $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
</span><span class="cx"> $tags_per_page = apply_filters( 'tagsperpage', $tags_per_page ); // Old filter
</span><del>-} elseif ( 'category' == $taxonomy ) {
</del><ins>+} elseif ( 'category' == $taxonomy ) {
</ins><span class="cx"> $tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page ); // Old filter
</span><span class="cx"> } else {
</span><span class="cx"> $tags_per_page = apply_filters( 'edit_' . $taxonomy . '_per_page', $tags_per_page );
</span><span class="lines">@@ -304,10 +304,10 @@
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <?php if ( 'category' == $taxonomy ) : ?>
</span><del>-<div class="form-wrap">
-<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
-<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
-</div>
</del><ins>+<div class="form-wrap">
+<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category')))) ?></p>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p>
+</div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdefaultitemsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-default-items.dev.js (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-default-items.dev.js 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/js/custom-navigation-default-items.dev.js 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> /*
</span><span class="cx"> * Init Functions
</span><span class="cx"> */
</span><span class="lines">@@ -23,37 +23,37 @@
</span><span class="cx"> modal: true,
</span><span class="cx"> buttons: {
</span><span class="cx"> 'Save': function() {
</span><del>-
</del><ins>+
</ins><span class="cx"> titletosave = $('#edittitle').attr('value');
</span><span class="cx"> linktosave = $('#editlink').attr('value');
</span><span class="cx"> anchortitletosave = $('#editanchortitle').attr('value');
</span><span class="cx"> newwindowtosave = $('#editnewwindow').attr('value');
</span><span class="cx"> desctosave = $('#editdescription').attr('value');
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#title' + $(this).dialog('option', 'itemID')).attr('value',titletosave);
</span><span class="cx"> $('#linkurl' + $(this).dialog('option', 'itemID')).attr('value',linktosave);
</span><span class="cx"> $('#anchortitle' + $(this).dialog('option', 'itemID')).attr('value',anchortitletosave);
</span><span class="cx"> $('#newwindow' + $(this).dialog('option', 'itemID')).attr('value',newwindowtosave);
</span><span class="cx"> $('#description' + $(this).dialog('option', 'itemID')).attr('value',desctosave);
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#menu-' + $(this).dialog('option', 'itemID') + ' > dl > dt > span.title').text(titletosave);
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#view' + + $(this).dialog('option', 'itemID')).attr('href', linktosave);
</span><del>-
</del><ins>+
</ins><span class="cx"> $(this).dialog('close');
</span><del>-
</del><ins>+
</ins><span class="cx"> },
</span><span class="cx"> Cancel: function() {
</span><span class="cx"> $(this).dialog('close');
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ $(this).remove();});
</span><del>-
</del><ins>+
</ins><span class="cx"> //Add dropzone
</span><del>- $('#custom-nav li').prepend('<div class="dropzone"></div>');
-
</del><ins>+ $('#custom-nav li').prepend('<div class="dropzone"></div>');
+
</ins><span class="cx"> //Make li items draggable
</span><span class="cx"> $('#custom-nav li').draggable({
</span><span class="cx"> handle: ' > dl',
</span><span class="lines">@@ -68,70 +68,70 @@
</span><span class="cx"> {
</span><span class="cx"> accept: '#custom-nav li',
</span><span class="cx"> tolerance: 'pointer',
</span><del>- drop: function(e, ui)
</del><ins>+ drop: function(e, ui)
</ins><span class="cx"> {
</span><span class="cx"> var li = $(this).parent();
</span><span class="cx"> var child = !$(this).hasClass('dropzone');
</span><span class="cx"> //Add UL to first child
</span><del>- if (child && li.children('ul').length == 0)
</del><ins>+ if (child && li.children('ul').length == 0)
</ins><span class="cx"> {
</span><span class="cx"> li.append('<ul id="sub-menu" />');
</span><span class="cx"> }
</span><span class="cx"> //Make it draggable
</span><del>- if (child)
</del><ins>+ if (child)
</ins><span class="cx"> {
</span><span class="cx"> li.children('ul').append(ui.draggable);
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> li.before(ui.draggable);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });
</span><del>-
</del><ins>+
</ins><span class="cx"> var draggablevalue = ui.draggable.attr('value');
</span><span class="cx"> var droppablevalue = li.attr('value');
</span><del>- li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</del><ins>+ li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</ins><span class="cx"> $(this).parent().find("dt").removeAttr('style');
</span><span class="cx"> $(this).parent().find("div:first").removeAttr('style');
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> },
</span><del>- over: function()
</del><ins>+ over: function()
</ins><span class="cx"> {
</span><span class="cx"> //Add child
</span><del>- if ($(this).attr('class') == 'dropzone ui-droppable')
</del><ins>+ if ($(this).attr('class') == 'dropzone ui-droppable')
</ins><span class="cx"> {
</span><span class="cx"> $(this).parent().find("div:first").css('background', 'none').css('height', '50px');
</span><span class="cx"> }
</span><span class="cx"> //Add above
</span><del>- else if ($(this).attr('class') == 'ui-droppable')
</del><ins>+ else if ($(this).attr('class') == 'ui-droppable')
</ins><span class="cx"> {
</span><span class="cx"> $(this).parent().find("dt:first").css('background', '#d8d8d8');
</span><span class="cx"> }
</span><span class="cx"> //do nothing
</span><span class="cx"> else {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> var parentid = $(this).parent().attr('id');
</span><del>-
</del><ins>+
</ins><span class="cx"> },
</span><del>- out: function()
</del><ins>+ out: function()
</ins><span class="cx"> {
</span><span class="cx"> $(this).parent().find("dt").removeAttr('style');
</span><span class="cx"> $(this).parent().find("div:first").removeAttr('style');
</span><span class="cx"> $(this).filter('.dropzone').css({ borderColor: '' });
</span><span class="cx"> },
</span><span class="cx"> deactivate: function()
</span><del>- {
-
-
</del><ins>+ {
+
+
</ins><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> });
</span><del>-
- //Handle Save Button Clicks
</del><ins>+
+ //Handle Save Button Clicks
</ins><span class="cx"> $('#save_top').click(function()
</span><span class="cx"> {
</span><span class="cx"> updatepostdata();
</span><span class="lines">@@ -140,8 +140,8 @@
</span><span class="cx"> {
</span><span class="cx"> updatepostdata();
</span><span class="cx"> });
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationdynamicfunctionsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/js/custom-navigation-dynamic-functions.dev.js 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -8,22 +8,22 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><del>-
</del><ins>+
</ins><span class="cx"> /*
</span><span class="cx"> * Removes menu items from current menu
</span><span class="cx"> * @param int o - the id of the menu li to remove.
</span><span class="cx"> */
</span><del>-function removeitem(o)
</del><ins>+function removeitem(o)
</ins><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> var todelete = document.getElementById('menu-' + o);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (todelete)
</span><del>- {
</del><ins>+ {
</ins><span class="cx"> var parenttodelete = document.getElementById('menu-' + o).parentNode;
</span><del>- throwaway_node = parenttodelete.removeChild(todelete);
- }
-
</del><ins>+ throwaway_node = parenttodelete.removeChild(todelete);
+ }
+
</ins><span class="cx"> updatepostdata();
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -31,50 +31,50 @@
</span><span class="cx"> * Loads dialog window to edit menu items from current menu
</span><span class="cx"> * @param int o - the id of the menu li to edit.
</span><span class="cx"> */
</span><del>-function edititem(o)
</del><ins>+function edititem(o)
</ins><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> itemTitle = jQuery('#title' + o).attr('value');
</span><span class="cx"> itemURL = jQuery('#linkurl' + o).attr('value');
</span><span class="cx"> itemAnchorTitle = jQuery('#anchortitle' + o).attr('value');
</span><span class="cx"> itemNewWindow = jQuery('#newwindow' + o).attr('value');
</span><span class="cx"> itemDesc = jQuery('#description' + o).attr('value');
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#dialog-confirm').dialog( 'option' , 'itemID' , o )
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#dialog-confirm').dialog('open');
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery('#edittitle').attr('value', itemTitle);
</span><span class="cx"> jQuery('#editlink').attr('value', itemURL);
</span><span class="cx"> jQuery('#editanchortitle').attr('value', itemAnchorTitle);
</span><span class="cx"> jQuery("#editnewwindow option[value='" + itemNewWindow + "']").attr('selected', 'selected');
</span><span class="cx"> jQuery('#editdescription').attr('value', itemDesc);
</span><del>-
</del><ins>+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> * Prepares menu items for POST
</span><span class="cx"> */
</span><del>-function updatepostdata()
-{
-
</del><ins>+function updatepostdata()
+{
+
</ins><span class="cx"> var i = 0;
</span><span class="cx"> jQuery("#custom-nav").find("li").each(function(i) {
</span><span class="cx"> i = i + 1;
</span><span class="cx"> var j = jQuery(this).attr('value');
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#position' + j).attr('value', i);
</span><span class="cx"> jQuery(this).attr('id','menu-' + i);
</span><span class="cx"> jQuery(this).attr('value', i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#dbid' + j).attr('name','dbid' + i);
</span><span class="cx"> jQuery(this).find('#dbid' + j).attr('id','dbid' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#postmenu' + j).attr('name','postmenu' + i);
</span><span class="cx"> jQuery(this).find('#postmenu' + j).attr('id','postmenu' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> var p = jQuery(this).find('#parent' + j).parent().parent().parent().attr('value');
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#parent' + j).attr('name','parent' + i);
</span><span class="cx"> jQuery(this).find('#parent' + j).attr('id','parent' + i);
</span><span class="cx"> if (p) {
</span><span class="lines">@@ -84,33 +84,33 @@
</span><span class="cx"> //reset p to be top level
</span><span class="cx"> p = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#parent' + j).attr('value', p);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#title' + j).attr('name','title' + i);
</span><span class="cx"> jQuery(this).find('#title' + j).attr('id','title' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#linkurl' + j).attr('name','linkurl' + i);
</span><span class="cx"> jQuery(this).find('#linkurl' + j).attr('id','linkurl' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#description' + j).attr('name','description' + i);
</span><span class="cx"> jQuery(this).find('#description' + j).attr('id','description' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#icon' + j).attr('name','icon' + i);
</span><span class="cx"> jQuery(this).find('#icon' + j).attr('id','icon' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#position' + j).attr('name','position' + i);
</span><span class="cx"> jQuery(this).find('#position' + j).attr('id','position' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#linktype' + j).attr('name','linktype' + i);
</span><span class="cx"> jQuery(this).find('#linktype' + j).attr('id','linktype' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#anchortitle' + j).attr('name','anchortitle' + i);
</span><span class="cx"> jQuery(this).find('#anchortitle' + j).attr('id','anchortitle' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('#newwindow' + j).attr('name','newwindow' + i);
</span><span class="cx"> jQuery(this).find('#newwindow' + j).attr('id','newwindow' + i);
</span><del>-
</del><ins>+
</ins><span class="cx"> jQuery(this).find('dl > dt > span > #remove' + j).attr('value', i);
</span><span class="cx"> jQuery(this).find('dl > dt > span > #remove' + j).attr('onClick', 'removeitem(' + i + ')');
</span><span class="cx"> jQuery(this).find('dl > dt > span > #remove' + j).attr('id','remove' + i);
</span><span class="lines">@@ -118,11 +118,11 @@
</span><span class="cx"> jQuery('#licount').attr('value',i);
</span><span class="cx">
</span><span class="cx"> });
</span><del>-
-
-
-};
</del><span class="cx">
</span><ins>+
+
+};
+
</ins><span class="cx"> /*
</span><span class="cx"> * Adds item from Page, Category, or Custom options menu
</span><span class="cx"> * @param string templatedir - directory of the add, edit, view images.
</span><span class="lines">@@ -132,8 +132,8 @@
</span><span class="cx"> * @param int itemid - menu id.
</span><span class="cx"> * @param int itemparentid - default 0.
</span><span class="cx"> * @param string itemdescription - the description of the menu item.
</span><del>-*/
-function appendToList(templatedir,additemtype,itemtext,itemurl,itemid,itemparentid,itemdescription)
</del><ins>+*/
+function appendToList(templatedir,additemtype,itemtext,itemurl,itemid,itemparentid,itemdescription)
</ins><span class="cx"> {
</span><span class="cx"> var inputvaluevarname = '';
</span><span class="cx"> var inputvaluevarurl = '';
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> var inputdescription = '';
</span><span class="cx"> var inputicon = '';
</span><span class="cx">
</span><del>- if (additemtype == 'Custom')
</del><ins>+ if (additemtype == 'Custom')
</ins><span class="cx"> {
</span><span class="cx"> inputvaluevarname = document.getElementById('custom_menu_item_name').value;
</span><span class="cx"> inputvaluevarurl = document.getElementById('custom_menu_item_url').value;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> inputparentid = '0';
</span><span class="cx"> inputlinktype = 'page';
</span><span class="cx"> inputdescription = htmlentities(itemdescription.toString());
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> else if (additemtype == 'Category')
</span><span class="cx"> {
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> inputlinktype = 'category';
</span><span class="cx"> inputdescription = htmlentities(itemdescription.toString());
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> inputvaluevarname = '';
</span><span class="cx"> inputvaluevarname = '';
</span><span class="lines">@@ -179,40 +179,40 @@
</span><span class="cx"> inputlinktype = 'custom';
</span><span class="cx"> inputdescription = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> var count=document.getElementById('custom-nav').getElementsByTagName('li').length;
</span><span class="cx">
</span><span class="cx"> var randomnumber = count;
</span><span class="cx">
</span><span class="cx"> var validatetest = 0;
</span><span class="cx">
</span><del>- try
</del><ins>+ try
</ins><span class="cx"> {
</span><span class="cx"> var test=document.getElementById("menu-" + randomnumber.toString()).value;
</span><span class="cx"> }
</span><del>- catch (err)
</del><ins>+ catch (err)
</ins><span class="cx"> {
</span><span class="cx"> validatetest = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- while (validatetest == 0)
</del><ins>+ while (validatetest == 0)
</ins><span class="cx"> {
</span><span class="cx"> randomnumber = randomnumber + 1;
</span><span class="cx">
</span><del>- try
</del><ins>+ try
</ins><span class="cx"> {
</span><span class="cx"> var test2=document.getElementById("menu-" + randomnumber.toString()).value;
</span><span class="cx"> }
</span><del>- catch (err)
</del><ins>+ catch (err)
</ins><span class="cx"> {
</span><span class="cx"> validatetest = 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //Notification Message
</span><span class="cx"> jQuery('.maintitle').after('<div id="message" class="updated fade below-h2"><p>Menu Item added!</p></div>');
</span><span class="cx"> jQuery('#message').animate({ opacity: 1.0 },2000).fadeOut(300, function(){ jQuery(this).remove();});
</span><del>-
</del><ins>+
</ins><span class="cx"> //Appends HTML to the menu
</span><span class="cx"> jQuery('#custom-nav').append('<li id="menu-' + randomnumber + '" value="' + randomnumber + '"><div class="dropzone ui-droppable"></div><dl class="ui-droppable"><dt><span class="title">' + inputvaluevarname + '</span><span class="controls"><span class="type">' + additemtype + '</span><a id="edit' + randomnumber + '" onclick="edititem(' + randomnumber + ')" value="' + randomnumber +'"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="' + templatedir + '/wp-admin/images/ico-edit.png" /></a> <a id="remove' + randomnumber + '" onclick="removeitem(' + randomnumber + ')" value="' + randomnumber +'"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="' + templatedir + '/wp-admin/images/ico-close.png" /></a> <a href="' + inputvaluevarurl + '" target="_blank"><img alt="View Custom Link" title="View Custom Link" src="' + templatedir + '/wp-admin/images/ico-viewpage.png" /></a></span></dt></dl><a class="hide" href="' + inputvaluevarurl + '">' + inputvaluevarname + '</a><input type="hidden" name="postmenu' + randomnumber + '" id="postmenu' + randomnumber + '" value="' + inputitemid + '" /><input type="hidden" name="parent' + randomnumber + '" id="parent' + randomnumber + '" value="' + inputparentid + '" /><input type="hidden" name="title' + randomnumber + '" id="title' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="linkurl' + randomnumber + '" id="linkurl' + randomnumber + '" value="' + inputvaluevarurl + '" /><input type="hidden" name="description' + randomnumber + '" id="description' + randomnumber + '" value="' + inputdescription + '" /><input type="hidden" name="icon' + randomnumber + '" id="icon' + randomnumber + '" value="' + inputicon + '" /><input type="hidden" name="position' + randomnumber + '" id="position' + randomnumber + '" value="' + randomnumber + '" /><input type="hidden" name="linktype' + randomnumber + '" id="linktype' + randomnumber + '" value="' + inputlinktype + '" /><input type="hidden" name="anchortitle' + randomnumber + '" id="anchortitle' + randomnumber + '" value="' + inputvaluevarname + '" /><input type="hidden" name="newwindow' + randomnumber + '" id="newwindow' + randomnumber + '" value="0" /></li>');
</span><span class="cx">
</span><span class="lines">@@ -230,54 +230,54 @@
</span><span class="cx"> jQuery('#menu-' + randomnumber + ' dl, #menu-' + randomnumber + ' .dropzone').droppable({
</span><span class="cx"> accept: '#' + randomnumber + ', #custom-nav li',
</span><span class="cx"> tolerance: 'pointer',
</span><del>- drop: function(e, ui)
</del><ins>+ drop: function(e, ui)
</ins><span class="cx"> {
</span><span class="cx"> var li = jQuery(this).parent();
</span><span class="cx"> var child = !jQuery(this).hasClass('dropzone');
</span><span class="cx"> //Append UL to first child
</span><del>- if (child && li.children('ul').length == 0)
</del><ins>+ if (child && li.children('ul').length == 0)
</ins><span class="cx"> {
</span><span class="cx"> li.append('<ul/>');
</span><span class="cx"> }
</span><span class="cx"> //Make it draggable
</span><del>- if (child)
</del><ins>+ if (child)
</ins><span class="cx"> {
</span><span class="cx"> li.children('ul').append(ui.draggable);
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> li.before(ui.draggable);
</span><span class="cx"> }
</span><del>-
- li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });
-
</del><ins>+
+ li.find('dl,.dropzone').css({ backgroundColor: '', borderColor: '' });
+
</ins><span class="cx"> var draggablevalue = ui.draggable.attr('value');
</span><span class="cx"> var droppablevalue = li.attr('value');
</span><del>- li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</del><ins>+ li.find('#menu-' + draggablevalue).find('#parent' + draggablevalue).val(droppablevalue);
</ins><span class="cx"> jQuery(this).parent().find("dt").removeAttr('style');
</span><span class="cx"> jQuery(this).parent().find("div:first").removeAttr('style');
</span><del>-
</del><ins>+
</ins><span class="cx"> },
</span><del>- over: function()
</del><ins>+ over: function()
</ins><span class="cx"> {
</span><span class="cx"> //Add child
</span><del>- if (jQuery(this).attr('class') == 'dropzone ui-droppable')
</del><ins>+ if (jQuery(this).attr('class') == 'dropzone ui-droppable')
</ins><span class="cx"> {
</span><span class="cx"> jQuery(this).parent().find("div:first").css('background', 'none').css('height', '50px');
</span><span class="cx"> }
</span><span class="cx"> //Add above
</span><del>- else if (jQuery(this).attr('class') == 'ui-droppable')
</del><ins>+ else if (jQuery(this).attr('class') == 'ui-droppable')
</ins><span class="cx"> {
</span><span class="cx"> jQuery(this).parent().find("dt:first").css('background', '#d8d8d8');
</span><span class="cx"> }
</span><span class="cx"> //do nothing
</span><span class="cx"> else {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> var parentid = jQuery(this).parent().attr('id');
</span><del>-
</del><ins>+
</ins><span class="cx"> },
</span><del>- out: function()
</del><ins>+ out: function()
</ins><span class="cx"> {
</span><span class="cx"> jQuery(this).parent().find("dt").removeAttr('style');
</span><span class="cx"> jQuery(this).parent().find("div:first").removeAttr('style');
</span></span></pre></div>
<a id="trunkwpadminjscustomnavigationphpfunctionsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-navigation-php-functions.dev.js (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-navigation-php-functions.dev.js 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/js/custom-navigation-php-functions.dev.js 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-/*
</del><ins>+/*
</ins><span class="cx"> * More info at: http://phpjs.org
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This is version: 3.08
</span><span class="cx"> * php.js is copyright 2010 Kevin van Zonneveld.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Portions copyright Brett Zamir (http://brett-zamir.me), Kevin van Zonneveld
</span><span class="cx"> * (http://kevin.vanzonneveld.net), Onno Marsman, Theriault, Michael White
</span><span class="cx"> * (http://getsprink.com), Waldo Malqui Silva, Paulo Ricardo F. Santos, Jack,
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx"> * taith, Matt Bradley, FremyCompany, T.J. Leahy, Greg Frazier, Valentina De
</span><span class="cx"> * Rosa, Tod Gentille, Riddler (http://www.frontierwebdev.com/), Alexander M
</span><span class="cx"> * Beedie
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Dual licensed under the MIT (MIT-LICENSE.txt)
</span><span class="cx"> * and GPL (GPL-LICENSE.txt) licenses.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Permission is hereby granted, free of charge, to any person obtaining a
</span><span class="cx"> * copy of this software and associated documentation files (the
</span><span class="cx"> * "Software"), to deal in the Software without restriction, including
</span><span class="lines">@@ -95,10 +95,10 @@
</span><span class="cx"> * distribute, sublicense, and/or sell copies of the Software, and to
</span><span class="cx"> * permit persons to whom the Software is furnished to do so, subject to
</span><span class="cx"> * the following conditions:
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The above copyright notice and this permission notice shall be included
</span><span class="cx"> * in all copies or substantial portions of the Software.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
</span><span class="cx"> * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
</span><span class="cx"> * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> * OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
</span><span class="cx"> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
</span><span class="cx"> * OTHER DEALINGS IN THE SOFTWARE.
</span><del>- */
</del><ins>+ */
</ins><span class="cx">
</span><span class="cx"> function get_html_translation_table (table, quote_style) {
</span><span class="cx"> // http://kevin.vanzonneveld.net
</span><span class="lines">@@ -128,11 +128,11 @@
</span><span class="cx"> // % note: chooses to create the constants themselves.
</span><span class="cx"> // * example 1: get_html_translation_table('HTML_SPECIALCHARS');
</span><span class="cx"> // * returns 1: {'"': '&quot;', '&': '&amp;', '<': '&lt;', '>': '&gt;'}
</span><del>-
</del><ins>+
</ins><span class="cx"> var entities = {}, hash_map = {}, decimal = 0, symbol = '';
</span><span class="cx"> var constMappingTable = {}, constMappingQuoteStyle = {};
</span><span class="cx"> var useTable = {}, useQuoteStyle = {};
</span><del>-
</del><ins>+
</ins><span class="cx"> // Translate arguments
</span><span class="cx"> constMappingTable[0] = 'HTML_SPECIALCHARS';
</span><span class="cx"> constMappingTable[1] = 'HTML_ENTITIES';
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> symbol = String.fromCharCode(decimal);
</span><span class="cx"> hash_map[symbol] = entities[decimal];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return hash_map;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> var hash_map = {}, symbol = '', tmp_str = '', entity = '';
</span><span class="cx"> tmp_str = string.toString();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (false === (hash_map = this.get_html_translation_table('HTML_ENTITIES', quote_style))) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -295,6 +295,6 @@
</span><span class="cx"> entity = hash_map[symbol];
</span><span class="cx"> tmp_str = tmp_str.split(symbol).join(entity);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return tmp_str;
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminjstagsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/tags.dev.js (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/tags.dev.js 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/js/tags.dev.js 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> if ( ! res )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var parent = form.find('select#parent').val();
</del><ins>+ var parent = form.find('select#parent').val();
</ins><span class="cx">
</span><span class="cx"> if ( parent > 0 && $('#tag-' + parent ).length > 0 ) // If the parent exists on this page, insert it below. Else insert it at the top of the list.
</span><span class="cx"> $('#the-list #tag-' + parent).after( res.responses[0].supplemental['noparents'] ); // As the parent exists, Insert the version with - - - prefixed
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-admin/plugins.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -545,10 +545,10 @@
</span><span class="cx"> $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
</span><span class="cx"> if ( is_multisite() && is_super_admin() )
</span><span class="cx"> $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
</span><span class="cx"> $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! $is_active && current_user_can('delete_plugins') )
</span><span class="cx"> $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/canonical.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> $redirect['query'] = remove_query_arg( array( 'category_name', 'tag', 'cat', 'tag_id', 'term', 'taxonomy'), $redirect['query']);
</span><span class="cx"> if ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
</span><span class="cx"> $tax = get_taxonomy( $obj->taxonomy );
</span><del>- if ( false !== $tax->query_var)
</del><ins>+ if ( false !== $tax->query_var)
</ins><span class="cx"> $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/category-template.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -364,12 +364,12 @@
</span><span class="cx"> $output = "<select name='$name' id='$name' class='$class' $tab_index_attribute>\n";
</span><span class="cx"> else
</span><span class="cx"> $output = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($categories) && ! $r['hide_if_empty'] && !empty($show_option_none) ) {
</span><span class="cx"> $show_option_none = apply_filters( 'list_cats', $show_option_none );
</span><span class="cx"> $output .= "\t<option value='-1' selected='selected'>$show_option_none</option>\n";
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! empty( $categories ) ) {
</span><span class="cx">
</span><span class="cx"> if ( $show_option_all ) {
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/comment-template.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -1469,13 +1469,13 @@
</span><span class="cx"> $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p class="comment-form-author">' .
</span><span class="cx"> '<label for="author">' . __( 'Name' ) . '</label> ' .
</span><span class="cx"> ( $req ? '<span class="required">*</span>' : '' ) .
</span><del>- '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' .
</del><ins>+ '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" tabindex="1"' . $aria_req . ' />' .
</ins><span class="cx"> '</p><!-- #form-section-author .form-section -->',
</span><span class="cx"> 'email' => '<p class="comment-form-email">' .
</span><span class="cx"> '<label for="email">' . __( 'Email' ) . '</label> ' .
</span><span class="cx"> ( $req ? '<span class="required">*</span>' : '' ) .
</span><span class="cx"> '<input id="email" name="email" type="text" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30" tabindex="2"' . $aria_req . ' />' .
</span><del>- '</p><!-- #form-section-email .form-section -->',
</del><ins>+ '</p><!-- #form-section-email .form-section -->',
</ins><span class="cx"> 'url' => '<p class="comment-form-url">' .
</span><span class="cx"> '<label for="url">' . __( 'Website' ) . '</label>' .
</span><span class="cx"> '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" tabindex="3" />' .
</span><span class="lines">@@ -1486,7 +1486,7 @@
</span><span class="cx"> '</p><!-- #form-section-comment .form-section -->',
</span><span class="cx"> 'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
</span><span class="cx"> 'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out?</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
</span><del>- 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
</del><ins>+ 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email is <em>never</em> published nor shared.' ) . ( $req ? __( ' Required fields are marked <span class="required">*</span>' ) : '' ) . '</p>',
</ins><span class="cx"> 'comment_notes_after' => '<dl class="form-allowed-tags"><dt>' . __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes:' ) . '</dt> <dd><code>' . allowed_tags() . '</code></dd></dl>',
</span><span class="cx"> 'id_form' => 'commentform',
</span><span class="cx"> 'id_submit' => 'submit',
</span></span></pre></div>
<a id="trunkwpincludescustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/custom-navigation.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/custom-navigation.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/custom-navigation.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_custom_navigation_setup($override = false) {
</span><del>-
</del><ins>+
</ins><span class="cx"> $nav_version = '1.1.0';
</span><span class="cx"> //Custom Navigation Menu Setup
</span><del>-
</del><ins>+
</ins><span class="cx"> //Check for Upgrades
</span><span class="cx"> if (get_option('wp_settings_custom_nav_version') <> '') {
</span><span class="cx"> $nav_version_in_db = get_option('wp_settings_custom_nav_version');
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> else {
</span><span class="cx"> $nav_version_in_db = '0';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //Override for menu descriptions
</span><span class="cx"> update_option('wp_settings_custom_nav_advanced_options','yes');
</span><del>-
- if(($nav_version_in_db <> $nav_version) || ($override))
</del><ins>+
+ if(($nav_version_in_db <> $nav_version) || ($override))
</ins><span class="cx"> update_option('wp_settings_custom_nav_version',$nav_version);
</span><span class="cx">
</span><span class="cx"> $custom_menus = get_terms( 'menu', array( 'hide_empty' => false ) );
</span><span class="lines">@@ -84,20 +84,20 @@
</span><span class="cx"> /*-----------------------------------------------------------------------------------*/
</span><span class="cx">
</span><span class="cx"> function wp_custom_navigation_output($args = array()) {
</span><del>-
</del><ins>+
</ins><span class="cx"> //DEFAULT ARGS
</span><span class="cx"> $type = 'frontend';
</span><del>- $name = 'Menu 1';
</del><ins>+ $name = 'Menu 1';
</ins><span class="cx"> $id = 0;
</span><span class="cx"> $desc = 2;
</span><span class="cx"> $before_title = '';
</span><span class="cx"> $after_title = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($args)) {
</span><del>-
- if ( !is_array($args) )
</del><ins>+
+ if ( !is_array($args) )
</ins><span class="cx"> parse_str( $args, $args );
</span><del>-
</del><ins>+
</ins><span class="cx"> extract($args);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> {
</span><span class="cx"> $desc = 2;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $queried_id = 0;
</span><span class="cx"> global $wp_query;
</span><span class="cx"> if ( is_page() )
</span><span class="lines">@@ -145,14 +145,14 @@
</span><span class="cx"> $link = get_category_link( $menu_item->post_parent );
</span><span class="cx"> else
</span><span class="cx"> $link = $menu_item->guid;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $menu_item->post_title == '' ) {
</span><span class="cx"> $title_raw = get_categories( 'include='.$menu_item->post_parent );
</span><del>- $title = htmlentities($title_raw[0]->cat_name);
</del><ins>+ $title = htmlentities($title_raw[0]->cat_name);
</ins><span class="cx"> } else {
</span><span class="cx"> $title = htmlentities( $menu_item->post_title );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $menu_item->post_content == '' )
</span><span class="cx"> $description = htmlentities( strip_tags( category_description( $menu_item->post_parent ) ) );
</span><span class="cx"> else
</span><span class="lines">@@ -176,14 +176,14 @@
</span><span class="cx"> else {
</span><span class="cx"> $anchor_title = $title;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($queried_id == $wp_custom_nav_menu_items->post_id) {
</span><span class="cx"> $li_class = 'class="current_page_item"';
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> $li_class = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($wp_custom_nav_menu_items->new_window)) {
</span><span class="cx"> if ($wp_custom_nav_menu_items->new_window > 0) {
</span><span class="cx"> $target = 'target="_blank"';
</span><span class="lines">@@ -192,30 +192,30 @@
</span><span class="cx"> $target = '';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-*/
</del><ins>+*/
</ins><span class="cx"> //List Items
</span><span class="cx"> ?><li id="menu-<?php echo $menu_item->ID; ?>" value="<?php echo $menu_item->ID; ?>" <?php echo $li_class; ?>><?php
</span><span class="cx"> //@todo: update front end to use post data
</span><span class="cx"> //FRONTEND Link
</span><span class="cx"> if ($type == "frontend")
</span><del>- {
- ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $before_title.$title.$after_title; ?><?php
-
- if ( $advanced_option_descriptions == 'no' )
- {
</del><ins>+ {
+ ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $before_title.$title.$after_title; ?><?php
+
+ if ( $advanced_option_descriptions == 'no' )
+ {
</ins><span class="cx"> // 2 widget override do NOT display descriptions
</span><span class="cx"> // 1 widget override display descriptions
</span><span class="cx"> // 0 widget override not set
</span><span class="cx"> if (($desc == 1) || ($desc == 0) )
</span><span class="cx"> {
</span><span class="cx"> ?><span class="nav-description"><?php echo $description; ?></span><?php
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> elseif ($desc == 2)
</span><span class="cx"> { }
</span><span class="cx"> else
</span><span class="cx"> { }
</span><del>- }
- else
</del><ins>+ }
+ else
</ins><span class="cx"> {
</span><span class="cx"> // 2 widget override do NOT display descriptions
</span><span class="cx"> // 1 widget override display descriptions
</span><span class="lines">@@ -223,21 +223,21 @@
</span><span class="cx"> if ($desc == 1)
</span><span class="cx"> {
</span><span class="cx"> ?><span class="nav-description"><?php echo $description; ?></span><?php
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> elseif (($desc == 2) || ($desc == 0))
</span><span class="cx"> { }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> { }
</span><span class="cx"> }
</span><del>-
- ?></a><?php
</del><ins>+
+ ?></a><?php
</ins><span class="cx"> }
</span><span class="cx"> //BACKEND draggable and droppable elements
</span><span class="cx"> elseif ($type == "backend")
</span><span class="cx"> $link_type = substr( $menu_item->post_status, 5 );
</span><span class="cx"> {
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <dl>
</span><span class="cx"> <dt>
</span><span class="cx"> <span class="title"><?php echo $title; ?></span>
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> </span>
</span><span class="cx"> </dt>
</span><span class="cx"> </dl>
</span><del>-
</del><ins>+
</ins><span class="cx"> <a><span class=""></span></a>
</span><span class="cx"> <input type="hidden" name="dbid<?php echo $menu_item->menu_order; ?>" id="dbid<?php echo $menu_item->menu_order; ?>" value="<?php echo $menu_item->ID; ?>" />
</span><span class="cx"> <input type="hidden" name="postmenu<?php echo $menu_item->menu_order; ?>" id="postmenu<?php echo $menu_item->menu_order; ?>" value="<?php echo $id; ?>" />
</span><span class="lines">@@ -262,44 +262,44 @@
</span><span class="cx"> <input type="hidden" name="linktype<?php echo $menu_item->menu_order; ?>" id="linktype<?php echo $menu_item->menu_order; ?>" value="<?php echo $link_type; ?>" />
</span><span class="cx"> <input type="hidden" name="anchortitle<?php echo $menu_item->menu_order; ?>" id="anchortitle<?php echo $menu_item->menu_order; ?>" value="<?php echo esc_html( $menu_item->post_excerpt ); ?>" />
</span><span class="cx"> <input type="hidden" name="newwindow<?php echo $menu_item->menu_order; ?>" id="newwindow<?php echo $menu_item->menu_order; ?>" value="<?php echo ( '' == $menu_item->post_content_filtered ? '0' : '1' ); ?>" />
</span><del>-
- <?php
</del><ins>+
+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //@todo: implement menu heirarchy
</span><span class="cx"> /* //DISPLAY menu sub items
</span><del>- if ($wp_custom_nav_menu_items->parent_id == 0)
</del><ins>+ if ($wp_custom_nav_menu_items->parent_id == 0)
</ins><span class="cx"> {
</span><span class="cx"> //FRONTEND
</span><del>- if ($type == 'frontend')
</del><ins>+ if ($type == 'frontend')
</ins><span class="cx"> {
</span><span class="cx"> //Recursive function
</span><span class="cx"> $intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$wp_custom_nav_menu_id);
</span><span class="cx"> }
</span><span class="cx"> //BACKEND
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> //Recursive function
</span><span class="cx"> $intj = wp_custom_navigation_sub_items($wp_custom_nav_menu_items->id,$wp_custom_nav_menu_items->link_type,$table_name,$type,$id);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> */ ?></li>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> //@todo: implement menu heirarchy
</span><span class="cx"> //RECURSIVE Sub Menu Items
</span><span class="cx"> function wp_custom_navigation_sub_items($post_id,$type,$table_name,$output_type,$menu_id = 0) {
</span><del>-
</del><ins>+
</ins><span class="cx"> $parent_id = 0;
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> //GET sub menu items
</span><span class="cx"> $wp_custom_nav_menu = $wpdb->get_results("SELECT id,post_id,parent_id,position,custom_title,custom_link,custom_description,menu_icon,link_type,custom_anchor_title,new_window FROM ".$table_name." WHERE parent_id = '".$post_id."' AND menu_id='".$menu_id."' ORDER BY position ASC");
</span><del>-
</del><ins>+
</ins><span class="cx"> if (empty($wp_custom_nav_menu))
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="lines">@@ -317,26 +317,26 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> //DISPLAY Loop
</span><del>- foreach ($wp_custom_nav_menu as $sub_item)
</del><ins>+ foreach ($wp_custom_nav_menu as $sub_item)
</ins><span class="cx"> {
</span><span class="cx"> //Figure out where the menu item sits
</span><span class="cx"> $counter=$sub_item->position;
</span><del>-
</del><ins>+
</ins><span class="cx"> //Prepare Menu Data
</span><span class="cx"> //Category Menu Item
</span><del>- if ($sub_item->link_type == 'category')
</del><ins>+ if ($sub_item->link_type == 'category')
</ins><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> $parent_id = $sub_item->parent_id;
</span><span class="cx"> $post_id = $sub_item->post_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_item->custom_link == '') {
</span><span class="cx"> $link = get_category_link($sub_item->post_id);
</span><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> $link = $sub_item->custom_link;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_item->custom_title == '') {
</span><span class="cx"> $title_raw = get_categories('include='.$sub_item->post_id);
</span><span class="cx"> $title = htmlentities($title_raw[0]->cat_name);
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> else {
</span><span class="cx"> $title = htmlentities($sub_item->custom_title);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_item->custom_description == '') {
</span><span class="cx"> $description = strip_tags(category_description($sub_item->post_id));
</span><span class="cx"> }
</span><span class="lines">@@ -356,10 +356,10 @@
</span><span class="cx"> //Page Menu Item
</span><span class="cx"> elseif ($sub_item->link_type == 'page')
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> $parent_id = $sub_item->parent_id;
</span><span class="cx"> $post_id = $sub_item->post_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_item->custom_link == '') {
</span><span class="cx"> $link = get_permalink($sub_item->post_id);
</span><span class="cx"> }
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> else {
</span><span class="cx"> $title = htmlentities($sub_item->custom_title);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_item->custom_description == '') {
</span><span class="cx"> $description = get_post_meta($sub_item->post_id, 'page-description', true);
</span><span class="cx"> }
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> $description = $sub_item->custom_description;
</span><span class="cx"> }
</span><span class="cx"> $target = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> //Custom Menu Item
</span><span class="cx"> else
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> else {
</span><span class="cx"> $li_class = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //SET anchor title
</span><span class="cx"> if (isset($sub_item->custom_anchor_title)) {
</span><span class="cx"> $anchor_title = htmlentities($sub_item->custom_anchor_title);
</span><span class="lines">@@ -407,19 +407,19 @@
</span><span class="cx"> else {
</span><span class="cx"> $anchor_title = $title;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (isset($sub_item->new_window)) {
</span><span class="cx"> if ($sub_item->new_window > 0) {
</span><span class="cx"> $target = 'target="_blank"';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //List Items
</span><del>- ?><li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>" <?php echo $li_class; ?>><?php
</del><ins>+ ?><li id="menu-<?php echo $counter; ?>" value="<?php echo $counter; ?>" <?php echo $li_class; ?>><?php
</ins><span class="cx"> //FRONTEND
</span><span class="cx"> if ($output_type == "frontend")
</span><span class="cx"> {
</span><del>- ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $title; ?></a><?php
</del><ins>+ ?><a title="<?php echo $anchor_title; ?>" href="<?php echo $link; ?>" <?php echo $target; ?>><?php echo $title; ?></a><?php
</ins><span class="cx"> }
</span><span class="cx"> //BACKEND
</span><span class="cx"> elseif ($output_type == "backend")
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> <span class="title"><?php echo $title; ?></span>
</span><span class="cx"> <span class="controls">
</span><span class="cx"> <span class="type"><?php echo $sub_item->link_type; ?></span>
</span><del>- <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</del><ins>+ <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</ins><span class="cx"> <a id="remove<?php echo $counter; ?>" onclick="removeitem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" /></a>
</span><span class="cx"> <a id="view<?php echo $counter; ?>" target="_blank" href="<?php echo $link; ?>"><img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" /></a>
</span><span class="cx"> </span>
</span><span class="lines">@@ -448,23 +448,23 @@
</span><span class="cx"> <input type="hidden" name="linktype<?php echo $counter; ?>" id="linktype<?php echo $counter; ?>" value="<?php echo $sub_item->link_type; ?>" />
</span><span class="cx"> <input type="hidden" name="anchortitle<?php echo $counter; ?>" id="anchortitle<?php echo $counter; ?>" value="<?php echo $anchor_title; ?>" />
</span><span class="cx"> <input type="hidden" name="newwindow<?php echo $counter; ?>" id="newwindow<?php echo $counter; ?>" value="<?php echo $sub_item->new_window; ?>" />
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //Do recursion
</span><del>- wp_custom_navigation_sub_items($sub_item->id,$sub_item->link_type,$table_name,$output_type,$menu_id);
</del><ins>+ wp_custom_navigation_sub_items($sub_item->id,$sub_item->link_type,$table_name,$output_type,$menu_id);
</ins><span class="cx"> ?></li>
</span><del>- <?php
-
- }
-
</del><ins>+ <?php
+
+ }
+
</ins><span class="cx"> ?></ul>
</span><del>- <?php
-
- }
-
</del><ins>+ <?php
+
+ }
+
</ins><span class="cx"> return $parent_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -485,19 +485,19 @@
</span><span class="cx"> 'exclude_tree' => '',
</span><span class="cx"> 'number' => '',
</span><span class="cx"> 'offset' => 0 );
</span><del>-
- //GET all pages
</del><ins>+
+ //GET all pages
</ins><span class="cx"> $pages_array = get_pages($pages_args);
</span><del>-
</del><ins>+
</ins><span class="cx"> $intCounter = $counter;
</span><span class="cx"> $parentli = $intCounter;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($pages_array)
</span><span class="cx"> {
</span><span class="cx"> //DISPLAY Loop
</span><span class="cx"> foreach ($pages_array as $post)
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($post->post_parent == 0)
</span><span class="cx"> {
</span><span class="cx"> //Custom Menu
</span><span class="lines">@@ -505,15 +505,15 @@
</span><span class="cx"> {
</span><span class="cx"> $description = get_post_meta($post->ID, 'page-description', true);
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
</span><del>-
</del><ins>+
</ins><span class="cx"> <dl>
</span><span class="cx"> <dt>
</span><span class="cx"> <span class="title"><?php echo $post->post_title; ?></span>
</span><span class="cx"> <span class="controls">
</span><span class="cx"> <span class="type">page</span>
</span><del>- <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</del><ins>+ <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</ins><span class="cx"> <a id="remove<?php echo $intCounter; ?>" onclick="removeitem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>">
</span><span class="cx"> <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
</span><span class="cx"> </a>
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> <img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" />
</span><span class="cx"> </a>
</span><span class="cx"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> </dt>
</span><span class="cx"> </dl>
</span><span class="cx"> <a class="hide" href="<?php echo get_permalink($post->ID); ?>"><span class="title"><?php echo $post->post_title; ?></span>
</span><span class="lines">@@ -536,26 +536,26 @@
</span><span class="cx"> <input type="hidden" name="linktype<?php echo $intCounter; ?>" id="linktype<?php echo $intCounter; ?>" value="page" />
</span><span class="cx"> <input type="hidden" name="anchortitle<?php echo $intCounter; ?>" id="anchortitle<?php echo $intCounter; ?>" value="<?php echo htmlentities($post->post_title); ?>" />
</span><span class="cx"> <input type="hidden" name="newwindow<?php echo $intCounter; ?>" id="newwindow<?php echo $intCounter; ?>" value="0" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php $parentli = $post->ID; ?>
</span><del>- <?php $intCounter++; ?>
</del><ins>+ <?php $intCounter++; ?>
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //Recursive function
</span><span class="cx"> $intCounter = wp_custom_navigation_default_sub_items($post->ID, $intCounter, $parentli, 'pages', 'menu');
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </li>
</span><del>-
- <?php
-
</del><ins>+
+ <?php
+
</ins><span class="cx"> }
</span><span class="cx"> //Sidebar Menu
</span><span class="cx"> elseif ($type == 'default')
</span><span class="cx"> {
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <li>
</span><span class="cx"> <dl>
</span><span class="cx"> <dt>
</span><span class="lines">@@ -564,36 +564,36 @@
</span><span class="cx"> $post_url = get_permalink($post->ID);
</span><span class="cx"> $post_id = $post->ID;
</span><span class="cx"> $post_parent_id = $post->post_parent;
</span><del>-
</del><ins>+
</ins><span class="cx"> $description = htmlentities(get_post_meta($post_id, 'page-description', true));
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <?php $templatedir = get_bloginfo('url'); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <span class="title"><?php echo $post->post_title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','Page','<?php echo $post_text; ?>','<?php echo $post_url; ?>','<?php echo $post_id; ?>','<?php echo $post_parent_id ?>','<?php echo $description; ?>')" name="<?php echo $post_text; ?>" value="<?php echo get_permalink($post->ID); ?>"><img alt="Add to Custom Menu" title="Add to Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-add.png" /></a></dt>
</span><span class="cx"> </dl>
</span><span class="cx"> <?php $parentli = $post->ID; ?>
</span><del>- <?php $intCounter++; ?>
</del><ins>+ <?php $intCounter++; ?>
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //Recursive function
</span><span class="cx"> $intCounter = wp_custom_navigation_default_sub_items($post_id, $intCounter, $parentli, 'pages', 'default');
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </li>
</span><del>-
- <?php
-
</del><ins>+
+ <?php
+
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>-
- }
- }
- }
</del><ins>+
+ }
+ }
+ }
</ins><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> echo 'Not Found';
</span><span class="cx"> }
</span><span class="lines">@@ -616,14 +616,14 @@
</span><span class="cx"> 'include' => '',
</span><span class="cx"> 'number' => '',
</span><span class="cx"> 'pad_counts' => false );
</span><del>-
-
-
- $intCounter = $counter;
-
- //GET all categories
</del><ins>+
+
+
+ $intCounter = $counter;
+
+ //GET all categories
</ins><span class="cx"> $categories_array = get_categories($category_args);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($categories_array)
</span><span class="cx"> {
</span><span class="cx"> //DISPLAY Loop
</span><span class="lines">@@ -636,14 +636,14 @@
</span><span class="cx"> if ($type == 'menu')
</span><span class="cx"> {
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <li id="menu-<?php echo $intCounter; ?>" value="<?php echo $intCounter; ?>">
</span><span class="cx"> <dl>
</span><span class="cx"> <dt>
</span><span class="cx"> <span class="title"><?php echo $cat_item->cat_name; ?></span>
</span><span class="cx"> <span class="controls">
</span><span class="cx"> <span class="type">category</span>
</span><del>- <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</del><ins>+ <a id="edit<?php echo $intCounter; ?>" onclick="edititem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</ins><span class="cx"> <a id="remove<?php echo $intCounter; ?>" onclick="removeitem(<?php echo $intCounter; ?>)" value="<?php echo $intCounter; ?>">
</span><span class="cx"> <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
</span><span class="cx"> </a>
</span><span class="lines">@@ -651,11 +651,11 @@
</span><span class="cx"> <img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" />
</span><span class="cx"> </a>
</span><span class="cx"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> </dt>
</span><span class="cx"> </dl>
</span><span class="cx"> <a class="hide" href="<?php echo get_category_link($cat_item->cat_ID); ?>"><span class="title"><?php echo $cat_item->cat_name; ?></span>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> $use_cats_raw = get_option('wp_settings_custom_nav_descriptions');
</span><span class="cx"> $use_cats = strtolower($use_cats_raw);
</span><span class="cx"> if ($use_cats == 'yes') { ?>
</span><span class="lines">@@ -672,19 +672,19 @@
</span><span class="cx"> <input type="hidden" name="linktype<?php echo $intCounter; ?>" id="linktype<?php echo $intCounter; ?>" value="category" />
</span><span class="cx"> <input type="hidden" name="anchortitle<?php echo $intCounter; ?>" id="anchortitle<?php echo $intCounter; ?>" value="<?php echo htmlentities($cat_item->cat_name); ?>" />
</span><span class="cx"> <input type="hidden" name="newwindow<?php echo $intCounter; ?>" id="newwindow<?php echo $intCounter; ?>" value="0" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php $parentli = $cat_item->cat_ID; ?>
</span><del>- <?php $intCounter++; ?>
</del><ins>+ <?php $intCounter++; ?>
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> //Recursive function
</span><span class="cx"> $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories','menu');
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </li>
</span><del>-
- <?php
</del><ins>+
+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Sidebar Menu
</span><span class="cx"> elseif ($type == 'default')
</span><span class="lines">@@ -704,24 +704,24 @@
</span><span class="cx"> <span class="title"><?php echo $cat_item->cat_name; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','Category','<?php echo $post_text; ?>','<?php echo $post_url; ?>','<?php echo $post_id; ?>','<?php echo $post_parent_id ?>','<?php echo $description; ?>')" name="<?php echo $post_text; ?>" value="<?php echo $post_url; ?>"><img alt="Add to Custom Menu" title="Add to Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-add.png" /></a> </dt>
</span><span class="cx"> </dl>
</span><span class="cx"> <?php $parentli = $cat_item->cat_ID; ?>
</span><del>- <?php $intCounter++; ?>
- <?php
</del><ins>+ <?php $intCounter++; ?>
+ <?php
</ins><span class="cx"> //Recursive function
</span><span class="cx"> $intCounter = wp_custom_navigation_default_sub_items($cat_item->cat_ID, $intCounter, $parentli, 'categories','default');
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </li>
</span><del>-
- <?php
- }
- }
</del><ins>+
+ <?php
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> echo 'Not Found';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $intCounter;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -729,9 +729,9 @@
</span><span class="cx"> function wp_custom_navigation_default_sub_items($childof, $intCounter, $parentli, $type, $output_type) {
</span><span class="cx">
</span><span class="cx"> $counter = $intCounter;
</span><del>-
</del><ins>+
</ins><span class="cx"> //Custom Menu
</span><del>- if ($output_type == 'menu')
</del><ins>+ if ($output_type == 'menu')
</ins><span class="cx"> {
</span><span class="cx"> $sub_args = array(
</span><span class="cx"> 'child_of' => $childof,
</span><span class="lines">@@ -739,43 +739,43 @@
</span><span class="cx"> 'parent' => $childof);
</span><span class="cx"> }
</span><span class="cx"> //Sidebar Menu
</span><del>- elseif ($output_type == 'default')
</del><ins>+ elseif ($output_type == 'default')
</ins><span class="cx"> {
</span><span class="cx"> $sub_args = array(
</span><span class="cx"> 'child_of' => $childof,
</span><span class="cx"> 'hide_empty' => false,
</span><span class="cx"> 'parent' => $childof);
</span><span class="cx"> }
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
- //Get Sub Category Items
</del><ins>+
+ //Get Sub Category Items
</ins><span class="cx"> if ($type == 'categories')
</span><span class="cx"> {
</span><del>- $sub_array = get_categories($sub_args);
</del><ins>+ $sub_array = get_categories($sub_args);
</ins><span class="cx"> }
</span><span class="cx"> //Get Sub Page Items
</span><span class="cx"> elseif ($type == 'pages')
</span><span class="cx"> {
</span><span class="cx"> $sub_array = get_pages($sub_args);
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
+
</ins><span class="cx"> if ($sub_array)
</span><span class="cx"> {
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <ul id="sub-custom-nav-<?php echo $type ?>">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> //DISPLAY Loop
</span><span class="cx"> foreach ($sub_array as $sub_item)
</span><span class="cx"> {
</span><span class="cx"> //Prepare Menu Data
</span><span class="cx"> //Category Menu Item
</span><del>- if ($type == 'categories')
</del><ins>+ if ($type == 'categories')
</ins><span class="cx"> {
</span><span class="cx"> $link = get_category_link($sub_item->cat_ID);
</span><span class="cx"> $title = htmlentities($sub_item->cat_name);
</span><span class="lines">@@ -783,7 +783,7 @@
</span><span class="cx"> $itemid = $sub_item->cat_ID;
</span><span class="cx"> $linktype = 'category';
</span><span class="cx"> $appendtype = 'Category';
</span><del>- $description = htmlentities(strip_tags($sub_item->description));
</del><ins>+ $description = htmlentities(strip_tags($sub_item->description));
</ins><span class="cx"> }
</span><span class="cx"> //Page Menu Item
</span><span class="cx"> elseif ($type == 'pages')
</span><span class="lines">@@ -797,13 +797,13 @@
</span><span class="cx"> $description = htmlentities(get_post_meta($itemid, 'page-description', true));
</span><span class="cx"> }
</span><span class="cx"> //Custom Menu Item
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> $title = '';
</span><span class="cx"> $linktype = 'custom';
</span><span class="cx"> $appendtype= 'Custom';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //Custom Menu
</span><span class="cx"> if ($output_type == 'menu')
</span><span class="cx"> {
</span><span class="lines">@@ -814,7 +814,7 @@
</span><span class="cx"> <span class="title"><?php echo $title; ?></span>
</span><span class="cx"> <span class="controls">
</span><span class="cx"> <span class="type"><?php echo $linktype; ?></span>
</span><del>- <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</del><ins>+ <a id="edit<?php echo $counter; ?>" onclick="edititem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>"><img class="edit" alt="Edit Menu Item" title="Edit Menu Item" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-edit.png" /></a>
</ins><span class="cx"> <a id="remove<?php echo $counter; ?>" onclick="removeitem(<?php echo $counter; ?>)" value="<?php echo $counter; ?>">
</span><span class="cx"> <img class="remove" alt="Remove from Custom Menu" title="Remove from Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-close.png" />
</span><span class="cx"> </a>
</span><span class="lines">@@ -822,7 +822,7 @@
</span><span class="cx"> <img alt="View Page" title="View Page" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-viewpage.png" />
</span><span class="cx"> </a>
</span><span class="cx"> </span>
</span><del>-
</del><ins>+
</ins><span class="cx"> </dt>
</span><span class="cx"> </dl>
</span><span class="cx"> <a class="hide" href="<?php echo $link; ?>"><?php echo $title; ?></a>
</span><span class="lines">@@ -837,49 +837,49 @@
</span><span class="cx"> <input type="hidden" name="linktype<?php echo $counter; ?>" id="linktype<?php echo $counter; ?>" value="<?php echo $linktype; ?>" />
</span><span class="cx"> <input type="hidden" name="anchortitle<?php echo $counter; ?>" id="anchortitle<?php echo $counter; ?>" value="<?php echo $title; ?>" />
</span><span class="cx"> <input type="hidden" name="newwindow<?php echo $counter; ?>" id="newwindow<?php echo $counter; ?>" value="0" />
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php $counter++; ?>
</span><del>- <?php
-
</del><ins>+ <?php
+
</ins><span class="cx"> //Do recursion
</span><del>- $counter = wp_custom_navigation_default_sub_items($parent_id, $counter, $parent_id, $type, 'menu');
-
</del><ins>+ $counter = wp_custom_navigation_default_sub_items($parent_id, $counter, $parent_id, $type, 'menu');
+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </li>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Sidebar Menu
</span><span class="cx"> elseif ($output_type == 'default')
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <li>
</span><span class="cx"> <dl>
</span><span class="cx"> <dt>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php $templatedir = get_bloginfo('url'); ?>
</span><span class="cx"> <span class="title"><?php echo $title; ?></span> <a onclick="appendToList('<?php echo $templatedir; ?>','<?php echo $appendtype; ?>','<?php echo $title; ?>','<?php echo $link; ?>','<?php echo $itemid; ?>','<?php echo $parent_id ?>','<?php echo $description; ?>')" name="<?php echo $title; ?>" value="<?php echo $link; ?>"><img alt="Add to Custom Menu" title="Add to Custom Menu" src="<?php echo get_bloginfo('url'); ?>/wp-admin/images/ico-add.png" /></a> </dt>
</span><span class="cx"> </dl>
</span><del>- <?php
-
</del><ins>+ <?php
+
</ins><span class="cx"> //Do recursion
</span><span class="cx"> $counter = wp_custom_navigation_default_sub_items($itemid, $counter, $parent_id, $type, 'default');
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> </li>
</span><del>-
- <?php
</del><ins>+
+ <?php
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </ul>
</span><del>-
- <?php
</del><ins>+
+ <?php
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return $counter;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -891,19 +891,19 @@
</span><span class="cx"> function get_children_menu_elements($childof, $intCounter, $parentli, $type, $menu_id, $table_name) {
</span><span class="cx">
</span><span class="cx"> $counter = $intCounter;
</span><del>-
</del><ins>+
</ins><span class="cx"> global $wpdb;
</span><del>-
-
-
- //Get Sub Category Items
</del><ins>+
+
+
+ //Get Sub Category Items
</ins><span class="cx"> if ($type == 'categories')
</span><span class="cx"> {
</span><span class="cx"> $sub_args = array(
</span><span class="cx"> 'child_of' => $childof,
</span><span class="cx"> 'hide_empty' => false,
</span><span class="cx"> 'parent' => $childof);
</span><del>- $sub_array = get_categories($sub_args);
</del><ins>+ $sub_array = get_categories($sub_args);
</ins><span class="cx"> }
</span><span class="cx"> //Get Sub Page Items
</span><span class="cx"> elseif ($type == 'pages')
</span><span class="lines">@@ -911,14 +911,14 @@
</span><span class="cx"> $sub_args = array(
</span><span class="cx"> 'child_of' => $childof,
</span><span class="cx"> 'parent' => $childof);
</span><del>-
</del><ins>+
</ins><span class="cx"> $sub_array = get_pages($sub_args);
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($sub_array)
</span><span class="cx"> {
</span><span class="cx"> //DISPLAY Loop
</span><span class="lines">@@ -928,7 +928,7 @@
</span><span class="cx"> $sub_item_parent = $sub_item->parent;
</span><span class="cx"> }
</span><span class="cx"> elseif (isset($sub_item->post_parent)) {
</span><del>- $sub_item_parent = $sub_item->post_parent;
</del><ins>+ $sub_item_parent = $sub_item->post_parent;
</ins><span class="cx"> }
</span><span class="cx"> else {
</span><span class="cx"> }
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> {
</span><span class="cx"> //Prepare Menu Data
</span><span class="cx"> //Category Menu Item
</span><del>- if ($type == 'categories')
</del><ins>+ if ($type == 'categories')
</ins><span class="cx"> {
</span><span class="cx"> $link = get_category_link($sub_item->cat_ID);
</span><span class="cx"> $title = htmlentities($sub_item->cat_name);
</span><span class="lines">@@ -957,13 +957,13 @@
</span><span class="cx"> $appendtype= 'Page';
</span><span class="cx"> }
</span><span class="cx"> //Custom Menu Item
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> $title = '';
</span><span class="cx"> $linktype = 'custom';
</span><span class="cx"> $appendtype= 'Custom';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //CHECK for existing parent records
</span><span class="cx"> //echo $parent_id;
</span><span class="cx"> $wp_result = $wpdb->get_results("SELECT id FROM ".$table_name." WHERE post_id='".$parent_id."' AND link_type='".$linktype."' AND menu_id='".$menu_id."'");
</span><span class="lines">@@ -973,17 +973,17 @@
</span><span class="cx"> else {
</span><span class="cx"> //$parent_id = 0;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //INSERT item
</span><span class="cx"> $insert = "INSERT INTO ".$table_name." (position,post_id,parent_id,custom_title,custom_link,custom_description,menu_icon,link_type,menu_id,custom_anchor_title) "."VALUES ('".$counter."','".$itemid."','".$parent_id."','".$title."','".$link."','','','".$linktype."','".$menu_id."','".$title."')";
</span><span class="cx"> $results = $wpdb->query( $insert );
</span><del>-
</del><ins>+
</ins><span class="cx"> $counter++;
</span><span class="cx"> $counter = get_children_menu_elements($itemid, $counter, $parent_id, $type, $menu_id, $table_name);
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> //Do nothing
</span><span class="cx"> else {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesdefaultwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-widgets.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-widgets.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/default-widgets.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -1009,10 +1009,10 @@
</span><span class="cx">
</span><span class="cx"> function WP_CustomNavWidget() {
</span><span class="cx"> $widget_ops = array('description' => 'Use this widget to add one of your Custom Navigation Menus as a widget.' );
</span><del>- parent::WP_Widget(false, __('Custom Navigation Menu'),$widget_ops);
</del><ins>+ parent::WP_Widget(false, __('Custom Navigation Menu'),$widget_ops);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function widget($args, $instance) {
</del><ins>+ function widget($args, $instance) {
</ins><span class="cx"> $navmenu = $instance['navmenu'];
</span><span class="cx"> $navtitle = $instance['navtitle'];
</span><span class="cx"> $navdeveloper = strtolower($instance['navdeveloper']);
</span><span class="lines">@@ -1022,21 +1022,21 @@
</span><span class="cx"> $navdivclass = $instance['navdivclass'];
</span><span class="cx"> $navulid = $instance['navulid'];
</span><span class="cx"> $navulclass = $instance['navulclass'];
</span><del>-
</del><ins>+
</ins><span class="cx"> //Override for menu descriptions
</span><span class="cx"> $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options');
</span><del>- if ($advanced_option_descriptions == 'no')
- {
</del><ins>+ if ($advanced_option_descriptions == 'no')
+ {
</ins><span class="cx"> $navwidgetdescription = 2;
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> $navwidgetdescription = $instance['navwidgetdescription'];
</span><span class="cx"> }
</span><span class="cx"> $menuexists = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> //GET menu name
</span><span class="cx"> if ($navmenu > 0)
</span><span class="cx"> {
</span><span class="lines">@@ -1046,108 +1046,108 @@
</span><span class="cx"> $menuexists = true;
</span><span class="cx"> }
</span><span class="cx"> //Do nothing
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> $menuexists = false;
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-
- <?php
</del><ins>+
+ <?php
</ins><span class="cx"> //DEVELOPER settings enabled
</span><del>- if ($navdeveloper == 'yes')
- {
</del><ins>+ if ($navdeveloper == 'yes')
+ {
</ins><span class="cx"> //DISPLAY Custom DIV
</span><del>- if ($navdiv == 'yes')
- {
</del><ins>+ if ($navdiv == 'yes')
+ {
</ins><span class="cx"> ?>
</span><span class="cx"> <div id="<?php echo $navdivid; ?>" class="<?php echo $navdivclass; ?>">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Do NOT display DIV
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
- }
-
- }
</del><ins>+
+ }
+
+ }
</ins><span class="cx"> //DISPLAY default DIV
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><span class="cx"> <div class="widget">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h3><?php echo $navtitle; ?></h3>
</span><del>- <?php
-
- if ($menuexists)
</del><ins>+ <?php
+
+ if ($menuexists)
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><del>- <?php
-
</del><ins>+ <?php
+
</ins><span class="cx"> //DEVELOPER settings enabled
</span><del>- if ($navdeveloper == 'yes')
- {
</del><ins>+ if ($navdeveloper == 'yes')
+ {
</ins><span class="cx"> //DISPLAY Custom UL
</span><del>- if ($navul == 'yes')
- {
</del><ins>+ if ($navul == 'yes')
+ {
</ins><span class="cx"> ?>
</span><span class="cx"> <ul id="<?php echo $navulid; ?>" class="<?php echo $navulclass; ?>">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Do NOT display UL
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
- }
-
- }
</del><ins>+
+ }
+
+ }
</ins><span class="cx"> //DISPLAY default UL
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><span class="cx"> <ul class="custom-nav">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> //DISPLAY custom navigation menu
</span><span class="cx"> if (get_option('wp_custom_nav_menu') == 'true') {
</span><span class="cx"> custom_nav('name='.$wp_custom_nav_menu_name.'&desc='.$navwidgetdescription);
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> ?>
</span><del>-
- <?php
-
</del><ins>+
+ <?php
+
</ins><span class="cx"> //DEVELOPER settings enabled
</span><del>- if ($navdeveloper == 'yes')
- {
</del><ins>+ if ($navdeveloper == 'yes')
+ {
</ins><span class="cx"> //DISPLAY Custom UL
</span><del>- if ($navul == 'yes')
- {
</del><ins>+ if ($navul == 'yes')
+ {
</ins><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Do NOT display UL
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
- }
-
- }
</del><ins>+
+ }
+
+ }
</ins><span class="cx"> //DISPLAY default UL
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -1156,41 +1156,41 @@
</span><span class="cx"> echo "You have not setup the custom navigation widget correctly, please check your settings in the backend.";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> //DEVELOPER settings enabled
</span><del>- if ($navdeveloper == 'yes')
- {
</del><ins>+ if ($navdeveloper == 'yes')
+ {
</ins><span class="cx"> //DISPLAY Custom DIV
</span><del>- if ($navdiv == 'yes')
- {
</del><ins>+ if ($navdiv == 'yes')
+ {
</ins><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Do NOT display DIV
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
- }
-
- }
</del><ins>+
+ }
+
+ }
</ins><span class="cx"> //DISPLAY default DIV
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> ?><!-- /#nav-container -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function update($new_instance, $old_instance) {
</del><ins>+ function update($new_instance, $old_instance) {
</ins><span class="cx"> return $new_instance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function form($instance) {
</del><ins>+ function form($instance) {
</ins><span class="cx"> $navmenu = esc_attr($instance['navmenu']);
</span><span class="cx"> $navtitle = esc_attr($instance['navtitle']);
</span><span class="cx"> $navdeveloper = esc_attr($instance['navdeveloper']);
</span><span class="lines">@@ -1201,25 +1201,25 @@
</span><span class="cx"> $navulid = esc_attr($instance['navulid']);
</span><span class="cx"> $navulclass = esc_attr($instance['navulclass']);
</span><span class="cx"> $navwidgetdescription = esc_attr($instance['navwidgetdescription']);
</span><del>-
</del><ins>+
</ins><span class="cx"> global $wpdb;
</span><del>-
- //GET Menu Items for SELECT OPTIONS
</del><ins>+
+ //GET Menu Items for SELECT OPTIONS
</ins><span class="cx"> $table_name_custom_menus = $wpdb->prefix . "custom_nav_menus";
</span><span class="cx"> $custom_menu_records = $wpdb->get_results("SELECT id,menu_name FROM ".$table_name_custom_menus);
</span><del>-
</del><ins>+
</ins><span class="cx"> //CHECK if menus exist
</span><span class="cx"> if ($custom_menu_records > 0)
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><span class="cx"> <label for="<?php echo $this->get_field_id('navmenu'); ?>"><?php _e('Select Menu:'); ?></label>
</span><del>-
</del><ins>+
</ins><span class="cx"> <select id="<?php echo $this->get_field_id('navmenu'); ?>" name="<?php echo $this->get_field_name('navmenu'); ?>">
</span><del>- <?php
-
</del><ins>+ <?php
+
</ins><span class="cx"> //DISPLAY SELECT OPTIONS
</span><span class="cx"> foreach ($custom_menu_records as $custom_menu_record)
</span><span class="cx"> {
</span><span class="lines">@@ -1232,136 +1232,136 @@
</span><span class="cx"> ?>
</span><span class="cx"> <option value="<?php echo $custom_menu_record->id; ?>" <?php echo $selected_option; ?>><?php echo $custom_menu_record->menu_name; ?></option>
</span><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><del>-
</del><ins>+
</ins><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <label for="<?php echo $this->get_field_id('navtitle'); ?>"><?php _e('Title:'); ?></label>
</span><span class="cx"> <input type="text" name="<?php echo $this->get_field_name('navtitle'); ?>" value="<?php echo $navtitle; ?>" class="widefat" id="<?php echo $this->get_field_id('navtitle'); ?>" />
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><span class="cx"> <?php
</span><span class="cx"> $checked = strtolower($navdeveloper);
</span><span class="cx"> ?>
</span><del>-
- <label for="<?php echo $this->get_field_id('navdeveloper'); ?>"><?php _e('Advanced Options:'); ?></label><br />
</del><ins>+
+ <label for="<?php echo $this->get_field_id('navdeveloper'); ?>"><?php _e('Advanced Options:'); ?></label><br />
</ins><span class="cx"> <span class="checkboxes">
</span><span class="cx"> <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navdeveloper'); ?>" name="<?php echo $this->get_field_name('navdeveloper'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navdeveloper'); ?>" name="<?php echo $this->get_field_name('navdeveloper'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</span><span class="cx"> </span><!-- /.checkboxes -->
</span><del>-
</del><ins>+
</ins><span class="cx"> </p>
</span><del>-
- <?php
-
</del><ins>+
+ <?php
+
</ins><span class="cx"> //DEVELOPER settings
</span><span class="cx"> if ($checked == 'yes')
</span><span class="cx"> {
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><span class="cx"> <?php
</span><span class="cx"> $checked = strtolower($navdiv);
</span><span class="cx"> ?>
</span><del>-
- <label for="<?php echo $this->get_field_id('navdiv'); ?>"><?php _e('Wrap in container DIV:'); ?></label><br />
</del><ins>+
+ <label for="<?php echo $this->get_field_id('navdiv'); ?>"><?php _e('Wrap in container DIV:'); ?></label><br />
</ins><span class="cx"> <span class="checkboxes">
</span><span class="cx"> <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navdiv'); ?>" name="<?php echo $this->get_field_name('navdiv'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navdiv'); ?>" name="<?php echo $this->get_field_name('navdiv'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</span><span class="cx"> </span><!-- /.checkboxes -->
</span><del>-
</del><ins>+
</ins><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($checked == 'yes')
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <label for="<?php echo $this->get_field_id('navdivid'); ?>"><?php _e('DIV id:'); ?></label>
</span><span class="cx"> <input type="text" name="<?php echo $this->get_field_name('navdivid'); ?>" value="<?php echo $navdivid; ?>" class="widefat" id="<?php echo $this->get_field_id('navdivid'); ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <label for="<?php echo $this->get_field_id('navdivclass'); ?>"><?php _e('DIV class:'); ?></label>
</span><span class="cx"> <input type="text" name="<?php echo $this->get_field_name('navdivclass'); ?>" value="<?php echo $navdivclass; ?>" class="widefat" id="<?php echo $this->get_field_id('navdivclass'); ?>" />
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><span class="cx"> <?php
</span><span class="cx"> $checked = strtolower($navul);
</span><span class="cx"> ?>
</span><del>-
- <label for="<?php echo $this->get_field_id('navul'); ?>"><?php _e('Wrap in container UL:'); ?></label><br />
</del><ins>+
+ <label for="<?php echo $this->get_field_id('navul'); ?>"><?php _e('Wrap in container UL:'); ?></label><br />
</ins><span class="cx"> <span class="checkboxes">
</span><span class="cx"> <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navul'); ?>" name="<?php echo $this->get_field_name('navul'); ?>" value="yes" <?php if ($checked=='yes') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navul'); ?>" name="<?php echo $this->get_field_name('navul'); ?>" value="no" <?php if ($checked=='yes') { } else { echo 'checked="checked"'; } ?> />
</span><span class="cx"> </span><!-- /.checkboxes -->
</span><del>-
</del><ins>+
</ins><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> if ($checked == 'yes')
</span><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <label for="<?php echo $this->get_field_id('navulid'); ?>"><?php _e('UL id:'); ?></label>
</span><span class="cx"> <input type="text" name="<?php echo $this->get_field_name('navulid'); ?>" value="<?php echo $navulid; ?>" class="widefat" id="<?php echo $this->get_field_id('navulid'); ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> <p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <label for="<?php echo $this->get_field_id('navulclass'); ?>"><?php _e('UL class:'); ?></label>
</span><span class="cx"> <input type="text" name="<?php echo $this->get_field_name('navulclass'); ?>" value="<?php echo $navulclass; ?>" class="widefat" id="<?php echo $this->get_field_id('navulclass'); ?>" />
</span><span class="cx"> </p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <?php $advanced_option_descriptions = get_option('wp_settings_custom_nav_advanced_options'); ?>
</span><span class="cx"> <p <?php if ($advanced_option_descriptions == 'no') { ?>style="display:none;"<?php } ?>>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> $checked = strtolower($navwidgetdescription);
</span><span class="cx"> ?>
</span><del>-
- <label for="<?php echo $this->get_field_id('navwidgetdescription'); ?>"><?php _e('Show Top Level Descriptions:'); ?></label><br />
</del><ins>+
+ <label for="<?php echo $this->get_field_id('navwidgetdescription'); ?>"><?php _e('Show Top Level Descriptions:'); ?></label><br />
</ins><span class="cx"> <span class="checkboxes">
</span><span class="cx"> <label>Yes</label><input type="radio" id="<?php echo $this->get_field_name('navwidgetdescription'); ?>" name="<?php echo $this->get_field_name('navwidgetdescription'); ?>" value="1" <?php if ($checked=='1') { echo 'checked="checked"'; } ?> />
</span><span class="cx"> <label>No</label><input type="radio" id="<?php echo $this->get_field_name('navwidgetdescription'); ?>" name="<?php echo $this->get_field_name('navwidgetdescription'); ?>" value="2" <?php if ($checked=='1') { } else { echo 'checked="checked"'; } ?> />
</span><span class="cx"> </span><!-- /.checkboxes -->
</span><span class="cx"> </p>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx"> //Do nothing
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx"> //Error message for menus not existing
</span><del>- else
</del><ins>+ else
</ins><span class="cx"> {
</span><span class="cx"> ?>
</span><span class="cx"> <p>
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1408,9 +1408,9 @@
</span><span class="cx"> register_widget('WP_Widget_RSS');
</span><span class="cx">
</span><span class="cx"> register_widget('WP_Widget_Tag_Cloud');
</span><del>-
</del><ins>+
</ins><span class="cx"> register_widget('WP_CustomNavWidget');
</span><del>-
</del><ins>+
</ins><span class="cx"> do_action('widgets_init');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/deprecated.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -2062,7 +2062,7 @@
</span><span class="cx"> * @since 2.3.1
</span><span class="cx"> * @deprecated 2.8.0
</span><span class="cx"> * @deprecated Use esc_url_raw()
</span><del>- * @see esc_url_raw()
</del><ins>+ * @see esc_url_raw()
</ins><span class="cx"> *
</span><span class="cx"> * @param string $url The URL to be cleaned.
</span><span class="cx"> * @param array $protocols An array of acceptable protocols.
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/functions.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx"> * Removes option by name. Prevents removal of protected WordPress options.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><del>- * @subpackage Option
</del><ins>+ * @subpackage Option
</ins><span class="cx"> * @since 1.2.0
</span><span class="cx"> *
</span><span class="cx"> * @uses do_action() Calls 'delete_option' hook before option is deleted.
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/general-template.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -713,7 +713,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $tag = $wp_query->get_queried_object();;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! $tag )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/http.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/http.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx"> 'max_redirects' => $r['redirection'] + 1, // See #11557
</span><span class="cx"> 'protocol_version' => (float) $r['httpversion'],
</span><span class="cx"> 'header' => $strHeaders,
</span><del>- 'ignore_errors' => true, // Return non-200 requests.
</del><ins>+ 'ignore_errors' => true, // Return non-200 requests.
</ins><span class="cx"> 'timeout' => $r['timeout'],
</span><span class="cx"> 'ssl' => array(
</span><span class="cx"> 'verify_peer' => $ssl_verify,
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-constants.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-constants.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/ms-default-constants.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> */
</span><span class="cx"> function ms_cookie_constants( ) {
</span><span class="cx"> global $current_site;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @since 1.2.0
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/script-loader.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -397,16 +397,16 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //Custom Navigation
</span><span class="cx">
</span><span class="cx"> $scripts->add( 'custom-navigation-ui-custom', '/wp-admin/js/custom-navigation-custom-jquery-ui-1.7.2.js', array('jquery'), '1.7.2' );
</span><span class="cx"> $scripts->add_data( 'custom-navigation-ui-custom', 'group', 1 );
</span><del>-
</del><ins>+
</ins><span class="cx"> $scripts->add( 'custom-navigation-default-items', "/wp-admin/js/custom-navigation-default-items$suffix.js", false, '20100220' );
</span><span class="cx"> $scripts->add( 'custom-navigation-dynamic-functions', "/wp-admin/js/custom-navigation-dynamic-functions$suffix.js", false, '20100220' );
</span><span class="cx"> $scripts->add( 'custom-navigation-php-functions', "/wp-admin/js/custom-navigation-php-functions$suffix.js", false, '20100220' );
</span><del>-
</del><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx"> $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
</span><span class="cx"> $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
</span><span class="cx"> $styles->add( 'custom-navigation', "/wp-admin/css/custom-navigation$suffix.css", array(), '20100215' );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $rtl_styles as $rtl_style )
</span><span class="cx"> $styles->add_data( $rtl_style, 'rtl', true );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/taxonomy.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> if ( empty($args[$cap]) )
</span><span class="cx"> $args[$cap] = 'manage_categories';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty($args['singular_label']) )
</span><span class="cx"> $args['singular_label'] = $args['label'];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestemplateloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/template-loader.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/template-loader.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-includes/template-loader.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> do_feed();
</span><span class="cx"> return;
</span><span class="cx"> elseif ( is_trackback() ) :
</span><del>- include( ABSPATH . 'wp-trackback.php' );
</del><ins>+ include( ABSPATH . 'wp-trackback.php' );
</ins><span class="cx"> return;
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (13267 => 13268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-02-21 00:02:01 UTC (rev 13267)
+++ trunk/wp-settings.php 2010-02-21 00:03:42 UTC (rev 13268)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> // Check for the required PHP version and for the MySQL extension or a database drop-in.
</span><span class="cx"> wp_check_php_mysql_versions();
</span><span class="cx">
</span><del>-// Check if we have recieved a request due to missing favicon.ico
</del><ins>+// Check if we have recieved a request due to missing favicon.ico
</ins><span class="cx"> wp_favicon_request();
</span><span class="cx">
</span><span class="cx"> // Check if we're in maintenance mode.
</span></span></pre>
</div>
</div>
</body>
</html>