<!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>[13295] trunk/wp-admin/custom-navigation.php: Some gettext and formatting.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13295">13295</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-22 18:03:03 +0000 (Mon, 22 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Some gettext and formatting. see <a href="http://trac.wordpress.org/ticket/11817">#11817</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomnavigationphp">trunk/wp-admin/custom-navigation.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomnavigationphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-navigation.php (13294 => 13295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-navigation.php        2010-02-22 17:48:50 UTC (rev 13294)
+++ trunk/wp-admin/custom-navigation.php        2010-02-22 18:03:03 UTC (rev 13295)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">         ?&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;div class=&quot;wrap&quot;&gt;
</span><del>-        &lt;div id=&quot;no-js&quot;&gt;&lt;h3&gt;You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.&lt;/h3&gt;&lt;/div&gt;
</del><ins>+        &lt;div id=&quot;no-js&quot;&gt;&lt;h3&gt;&lt;?php _e('You do not have JavaScript enabled in your browser. Please enable it to access the Custom Menu functionality.'); ?&gt;&lt;/h3&gt;&lt;/div&gt;
</ins><span class="cx"> 
</span><span class="cx">         &lt;?php
</span><span class="cx">         $messagesdiv = '';
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">         if ( isset( $_POST['set_wp_menu'] ) ) {
</span><span class="cx">                 // @todo validate set_wp_menu
</span><span class="cx">             update_option( 'wp_custom_nav_menu', $_POST['enable_wp_menu'] );
</span><del>-                $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;'.$themename.&quot;'s Custom Menu has been updated!&lt;/p&gt;&lt;/div&gt;&quot;;
</del><ins>+                $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;' . __('Custom Menu has been updated!') . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if ( isset( $_POST['licount'] ) )
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">                  if ( $insert_menu_name != '' ) {
</span><span class="cx">                         $existing_term = get_term_by( 'name', $insert_menu_name, 'nav_menu' );
</span><span class="cx">                          if ( $existing_term ) {
</span><del>-                                 $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;' . $existing_term-&gt;name . ' Menu has already created - please try another name&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                                 $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;' . esc_html( sprintf( e__('A menu named &quot;%s&quot; already exists; please try another name.'), $existing_term-&gt;name ) ) . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                          } else {
</span><span class="cx">                                 $term = wp_insert_term( $insert_menu_name, 'nav_menu' );
</span><span class="cx">                                 if ( !is_wp_error($term) ) {
</span><span class="lines">@@ -104,13 +104,13 @@
</span><span class="cx">                                         $custom_menus[$term-&gt;term_id] = $term;
</span><span class="cx">                                          $menu_selected_id = $term-&gt;term_id;
</span><span class="cx">                                          $menu_id_in_edit = $menu_selected_id;
</span><del>-                                         $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;' . $term-&gt;name . ' Menu has been created!&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                                         $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;' . esc_html( sprintf( __('&quot;%s&quot; menu has been created!'), $term-&gt;name ) ) . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx"> 
</span><span class="cx">                                         $postCounter = 0;
</span><span class="cx">                                  }
</span><span class="cx">                          }
</span><span class="cx">                  } else {
</span><del>-                         $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;Please enter a valid Menu name&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                         $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;' . __('Please enter a valid menu name.') . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                  }
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -118,13 +118,13 @@
</span><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><del>-                        $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;'.$themename.&quot;'s Custom Menu has been RESET!&lt;/p&gt;&lt;/div&gt;&quot;;
</del><ins>+                        $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;updated fade below-h2&quot;&gt;&lt;p&gt;' . __('The menu has been reset.') . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                         // GET reset menu id
</span><span class="cx">                         $custom_menus = array();
</span><span class="cx">                         $menu_selected_id = 0;
</span><span class="cx">             } else {
</span><span class="cx">                     // DISPLAY SUCCESS MESSAGE IF Menu Reset Correctly
</span><del>-                        $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;'.$themename.&quot;'s Custom Menu could not be RESET. Please try again.&lt;/p&gt;&lt;/div&gt;&quot;;
</del><ins>+                        $messagesdiv = '&lt;div id=&quot;message&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;' . __('The menu could not be reset. Please try again.') . '&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">             }
</span><span class="cx">         } elseif ( $postCounter &gt; 0 &amp;&amp; $menu_selected_id &gt; 0 ) {
</span><span class="cx">                 $menu_objects = get_objects_in_term( $menu_selected_id, 'nav_menu' );
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx">                  ?&gt;
</span><span class="cx">                 &lt;div id=&quot;pages-left&quot;&gt;
</span><span class="cx">                         &lt;div class=&quot;inside&quot;&gt;
</span><del>-                        &lt;h2 class=&quot;maintitle&quot;&gt;Custom Navigation&lt;/h2&gt;
</del><ins>+                        &lt;h2 class=&quot;maintitle&quot;&gt;&lt;?php esc_html_e('Custom Navigation') ?&gt;&lt;/h2&gt;
</ins><span class="cx">                         &lt;?php
</span><span class="cx"> 
</span><span class="cx">                                 //CHECK if custom menu has been enabled
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> 
</span><span class="cx">                                 if ($checked == 'true') {
</span><span class="cx">                                 } else {
</span><del>-                                        echo '&lt;div id=&quot;message-enabled&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;&lt;strong&gt;The Custom Menu has not been Enabled yet. Please enable it in order to use it --------&gt;&lt;/strong&gt;&lt;/p&gt;&lt;/div&gt;';
</del><ins>+                                        echo '&lt;div id=&quot;message-enabled&quot; class=&quot;error fade below-h2&quot;&gt;&lt;p&gt;&lt;strong&gt;' . __('The Custom Menu has not been Enabled yet. Please enable it in order to use it --------&gt;') . '&lt;/strong&gt;&lt;/p&gt;&lt;/div&gt;';
</ins><span class="cx">                                 }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name-arrow&quot;&gt;
</span><span class="cx">                                         &lt;br/&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><del>-                                &lt;h3&gt;&lt;?php echo $menu_title; ?&gt;&lt;/h3&gt;
</del><ins>+                                &lt;h3&gt;&lt;?php echo esc_html($menu_title); ?&gt;&lt;/h3&gt;
</ins><span class="cx"> 
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -231,18 +231,18 @@
</span><span class="cx">                                 updatepostdata();
</span><span class="cx">                         &lt;/script&gt;
</span><span class="cx"> 
</span><del>-                        &lt;input id=&quot;save_bottom&quot; name=&quot;save_bottom&quot; type=&quot;submit&quot; value=&quot;Save All Changes&quot; /&gt;&lt;/p&gt;
</del><ins>+                        &lt;input id=&quot;save_bottom&quot; name=&quot;save_bottom&quot; type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Save All Changes'); ?&gt;&quot; /&gt;&lt;/p&gt;
</ins><span class="cx">                         &lt;/div&gt;&lt;!-- /.inside --&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;div id=&quot;menu-right&quot;&gt;
</span><span class="cx"> 
</span><del>-                        &lt;h2 class=&quot;heading&quot;&gt;Options&lt;/h2&gt;
</del><ins>+                        &lt;h2 class=&quot;heading&quot;&gt;&lt;?php esc_html_e('Options'); ?&gt;&lt;/h2&gt;
</ins><span class="cx"> 
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Setup Custom Menu&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Setup Custom Menu'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -257,14 +257,14 @@
</span><span class="cx">                                     ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                     &lt;span &gt;
</span><del>-                                            &lt;label&gt;Enable&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;enable_wp_menu&quot; value=&quot;true&quot; &lt;?php if ($checked=='true') { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
-                                            &lt;label&gt;Disable&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;enable_wp_menu&quot; value=&quot;false&quot; &lt;?php if ($checked=='true') { } else { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
</del><ins>+                                            &lt;label&gt;&lt;?php _e('Enable'); ?&gt;&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;enable_wp_menu&quot; value=&quot;true&quot; &lt;?php if ($checked=='true') { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
+                                            &lt;label&gt;&lt;?php _e('Disable'); ?&gt;&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;enable_wp_menu&quot; value=&quot;false&quot; &lt;?php if ($checked=='true') { } else { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
</ins><span class="cx">                                         &lt;/span&gt;&lt;!-- /.checkboxes --&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;input id=&quot;set_wp_menu&quot; type=&quot;submit&quot; value=&quot;Set Menu&quot; name=&quot;set_wp_menu&quot; class=&quot;button&quot; /&gt;&lt;br /&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;span&gt;
</span><del>-                                                &lt;label&gt;Reset Menu to Default&lt;/label&gt;
</del><ins>+                                                &lt;label&gt;&lt;?php _e('Reset Menu to Default'); ?&gt;&lt;/label&gt;
</ins><span class="cx">                                                 &lt;input id=&quot;reset_wp_menu&quot; type=&quot;submit&quot; value=&quot;Reset&quot; name=&quot;reset_wp_menu&quot; class=&quot;button&quot; onclick=&quot;return confirm('Are you sure you want to RESET the Custom Navigation Menu to its Default Settings?');&quot; /&gt;
</span><span class="cx">                                         &lt;/span&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Menu Selector&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Menu Selector'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><span class="cx">                                         &lt;select id=&quot;menu_select&quot; name=&quot;menu_select&quot;&gt;
</span><span class="lines">@@ -296,9 +296,9 @@
</span><span class="cx">                                                 ?&gt;
</span><span class="cx">                                         &lt;/select&gt;
</span><span class="cx"> 
</span><del>-                                        &lt;input id=&quot;switch_menu&quot; type=&quot;submit&quot; value=&quot;Switch&quot; name=&quot;switch_menu&quot; class=&quot;button&quot; /&gt;
</del><ins>+                                        &lt;input id=&quot;switch_menu&quot; type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Switch'); ?&gt;&quot; name=&quot;switch_menu&quot; class=&quot;button&quot; /&gt;
</ins><span class="cx">                                         &lt;input id=&quot;add_menu_name&quot; name=&quot;add_menu_name&quot; type=&quot;text&quot; value=&quot;&quot;  /&gt;
</span><del>-                                        &lt;input id=&quot;add_menu&quot; type=&quot;submit&quot; value=&quot;Add Menu&quot; name=&quot;add_menu&quot; class=&quot;button&quot; /&gt;
</del><ins>+                                        &lt;input id=&quot;add_menu&quot; type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Add Menu'); ?&gt;&quot; name=&quot;add_menu&quot; class=&quot;button&quot; /&gt;
</ins><span class="cx"> 
</span><span class="cx">                                         &lt;div class=&quot;fix&quot;&gt;&lt;/div&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><span class="lines">@@ -307,47 +307,40 @@
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot; style=&quot;display:none;&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Top Level Menu Descriptions&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Top Level Menu Descriptions'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><del>-                                        &lt;span&gt;Display Descriptions in Top Level Menu?&lt;/span&gt;
</del><ins>+                                        &lt;span&gt;&lt;?php _e('Display Descriptions in Top Level Menu?'); ?&gt;&lt;/span&gt;
</ins><span class="cx"> 
</span><span class="cx">                                         &lt;?php
</span><span class="cx"> 
</span><span class="cx">                                     //UPDATE and DISPLAY Menu Description Option
</span><del>-                                    if (isset($_POST['menu-descriptions']))
-                                    {
</del><ins>+                                    if ( isset($_POST['menu-descriptions']) ) {
</ins><span class="cx"> 
</span><del>-                                                if (isset($_POST['switch_menu'])) {
</del><ins>+                                                if ( isset($_POST['switch_menu']) ) {
</ins><span class="cx"> 
</span><del>-                                                }
-                                                else {
</del><ins>+                                                } else {
</ins><span class="cx">                                                         $menu_options_to_edit = $_POST['menu_id_in_edit'];
</span><span class="cx">                                                     update_option('wp_settings_custom_nav_'.$menu_options_to_edit.'_descriptions',$_POST['menu-descriptions']);
</span><span class="cx">                                                 }
</span><span class="cx"> 
</span><span class="cx">                                     }
</span><span class="cx"> 
</span><del>-                                    if ($menu_id_in_edit &gt; 0)
-                                        {
</del><ins>+                                    if ( $menu_id_in_edit &gt; 0 )
</ins><span class="cx">                                                 $checkedraw = get_option('wp_settings_custom_nav_'.$menu_id_in_edit.'_descriptions');
</span><del>-                                        }
-                                        else {
</del><ins>+                                        else
</ins><span class="cx">                                                 $checkedraw = get_option('wp_settings_custom_nav_'.$menu_selected_id.'_descriptions');
</span><del>-                                        }
</del><span class="cx"> 
</span><span class="cx">                                     $checked = strtolower($checkedraw);
</span><span class="cx"> 
</span><del>-                                    if ($advanced_option_descriptions == 'no')
-                                    {
</del><ins>+                                    if ( $advanced_option_descriptions == 'no' )
</ins><span class="cx">                                             $checked = 'no';
</span><del>-                                    }
</del><span class="cx"> 
</span><span class="cx">                                     ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                     &lt;span class=&quot;checkboxes&quot;&gt;
</span><del>-                                            &lt;label&gt;Yes&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;menu-descriptions&quot; value=&quot;yes&quot; &lt;?php if ($checked=='yes') { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
-                                            &lt;label&gt;No&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;menu-descriptions&quot; value=&quot;no&quot; &lt;?php if ($checked=='yes') { } else { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
</del><ins>+                                            &lt;label&gt;&lt;?php _e('Yes'); ?&gt;&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;menu-descriptions&quot; value=&quot;yes&quot; &lt;?php if ($checked=='yes') { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
+                                            &lt;label&gt;&lt;?php _e('No'); ?&gt;&lt;/label&gt;&lt;input type=&quot;radio&quot; name=&quot;menu-descriptions&quot; value=&quot;no&quot; &lt;?php if ($checked=='yes') { } else { echo 'checked=&quot;checked&quot;'; } ?&gt; /&gt;
</ins><span class="cx">                                         &lt;/span&gt;&lt;!-- /.checkboxes --&gt;
</span><span class="cx">                                     &lt;/form&gt;
</span><span class="cx">                                         &lt;div class=&quot;fix&quot;&gt;&lt;/div&gt;
</span><span class="lines">@@ -357,7 +350,7 @@
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Add an Existing Page&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Add an Existing Page'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -382,16 +375,12 @@
</span><span class="cx">                                         $pages_array = get_pages($pages_args);
</span><span class="cx">                                         $page_name = '';
</span><span class="cx">                                         //CHECK if pages exist
</span><del>-                                        if ($pages_array)
-                                        {
-                                                foreach ($pages_array as $post)
-                                                {
</del><ins>+                                        if ( $pages_array ) {
+                                                foreach ( $pages_array as $post ) {
</ins><span class="cx">                                                         //Add page name to
</span><span class="cx">                                                         $page_name .= htmlentities($post-&gt;post_title).'|';
</span><span class="cx">                                                 }
</span><del>-                                        }
-                                        else
-                                        {
</del><ins>+                                        } else {
</ins><span class="cx">                                                 $page_name = &quot;No pages available&quot;;
</span><span class="cx">                                         }
</span><span class="cx"> 
</span><span class="lines">@@ -447,23 +436,22 @@
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Add an Existing Category&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Add an Existing Category'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                                         &lt;?php
</span><span class="cx"> 
</span><del>-                                        //Custom GET categories query
</del><ins>+                                        // Custom GET categories query
+                                        // @todo Use API
</ins><span class="cx">                                         $categories = $wpdb-&gt;get_results(&quot;SELECT term_id FROM $wpdb-&gt;term_taxonomy WHERE taxonomy = 'category' ORDER BY term_id ASC&quot;);
</span><span class="cx">                                         $cat_name = '';
</span><span class="cx">                                         //CHECK for results
</span><del>-                                        if ($categories)
-                                        {
-                                                foreach($categories as $category)
-                                                {
</del><ins>+                                        if ( $categories ) {
+                                                foreach( $categories as $category ) {
</ins><span class="cx">                                                         $cat_id = $category-&gt;term_id;
</span><span class="cx"> 
</span><del>-                                                        $cat_args=array(
</del><ins>+                                                        $cat_args = array(
</ins><span class="cx">                                                                  'orderby' =&gt; 'name',
</span><span class="cx">                                                                   'include' =&gt; $cat_id,
</span><span class="cx">                                                                   'hierarchical' =&gt; 1,
</span><span class="lines">@@ -472,15 +460,12 @@
</span><span class="cx"> 
</span><span class="cx">                                                           $category_names=get_categories($cat_args);
</span><span class="cx"> 
</span><del>-                                                        if (isset($category_names[0]-&gt;name))
-                                                        {
-                                                                //Add category name to data string
</del><ins>+                                                        if ( isset($category_names[0]-&gt;name) ) {
+                                                                // Add category name to data string
</ins><span class="cx">                                                                 $cat_name .= htmlentities($category_names[0]-&gt;name).'|';
</span><span class="cx">                                                         }
</span><span class="cx">                                                   }
</span><del>-                                          }
-                                          else
-                                        {
</del><ins>+                                          } else {
</ins><span class="cx">                                                 $cat_name = &quot;No categories available&quot;;
</span><span class="cx">                                         }
</span><span class="cx"> 
</span><span class="lines">@@ -509,9 +494,8 @@
</span><span class="cx">                                                  });
</span><span class="cx">                                           &lt;/script&gt;
</span><span class="cx"> 
</span><ins>+                                        &lt;input type=&quot;text&quot; onfocus=&quot;jQuery('#cat-search').attr('value','');&quot; id=&quot;cat-search&quot; value=&quot;&lt;?php esc_attr_e('Search Categories'); ?&gt;&quot; /&gt;
</ins><span class="cx"> 
</span><del>-                                        &lt;input type=&quot;text&quot; onfocus=&quot;jQuery('#cat-search').attr('value','');&quot; id=&quot;cat-search&quot; value=&quot;Search Categories&quot; /&gt;
-
</del><span class="cx">                                         &lt;a id=&quot;show-cats&quot; style=&quot;cursor:pointer;&quot; onclick=&quot;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();&quot;&gt;View All&lt;/a&gt;
</span><span class="cx">                                         &lt;a id=&quot;hide-cats&quot; style=&quot;cursor:pointer;&quot; onclick=&quot;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();&quot;&gt;Hide All&lt;/a&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -536,13 +520,13 @@
</span><span class="cx">                         &lt;div class=&quot;widgets-holder-wrap&quot;&gt;
</span><span class="cx">                                 &lt;div class=&quot;sidebar-name&quot;&gt;
</span><span class="cx">                                         &lt;div class=&quot;sidebar-name-arrow&quot;&gt;&lt;/div&gt;
</span><del>-                                        &lt;h3&gt;Add a Custom Url&lt;/h3&gt;
</del><ins>+                                        &lt;h3&gt;&lt;?php esc_html_e('Add a Custom Url'); ?&gt;&lt;/h3&gt;
</ins><span class="cx">                                 &lt;/div&gt;
</span><span class="cx">                                 &lt;div class=&quot;widget-holder&quot;&gt;
</span><span class="cx">                                         &lt;input id=&quot;custom_menu_item_url&quot; type=&quot;text&quot; value=&quot;http://&quot;  /&gt;
</span><del>-                                        &lt;label&gt;URL&lt;/label&gt;&lt;br /&gt;
</del><ins>+                                        &lt;label&gt;&lt;?php _e('URL'); ?&gt;&lt;/label&gt;&lt;br /&gt;
</ins><span class="cx">                                    &lt;?php $templatedir = get_bloginfo('url'); ?&gt;
</span><del>-                            &lt;input type=&quot;hidden&quot; id=&quot;templatedir&quot; value=&quot;&lt;?php echo $templatedir; ?&gt;&quot; /&gt;
</del><ins>+                            &lt;input type=&quot;hidden&quot; id=&quot;templatedir&quot; value=&quot;&lt;?php echo esc_attr($templatedir); ?&gt;&quot; /&gt;
</ins><span class="cx">                             &lt;input id=&quot;custom_menu_item_name&quot; type=&quot;text&quot; value=&quot;Menu Item&quot; onfocus=&quot;jQuery('#custom_menu_item_name').attr('value','');&quot;  /&gt;
</span><span class="cx">                             &lt;label&gt;Menu Text&lt;/label&gt;&lt;br /&gt;
</span><span class="cx">                                    &lt;input id=&quot;custom_menu_item_description&quot; type=&quot;text&quot; value=&quot;A description&quot; &lt;?php if ($advanced_option_descriptions == 'no') { ?&gt;style=&quot;display:none;&quot;&lt;?php } ?&gt; onfocus=&quot;jQuery('#custom_menu_item_description').attr('value','');&quot; /&gt;
</span></span></pre>
</div>
</div>

</body>
</html>