WordPress.org
Get WordPress

Make WordPress Core

Changeset 11173


Ignore:
Timestamp:
05/04/2009 05:54:08 PM (17 years ago)
Author:
ryan
Message:

Attr escaping

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/import/blogger.php

    r11081 r11173  
    5252                $prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).');
    5353                $stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
    54                 $auth = __('Authorize');
     54                $auth = _a('Authorize');
    5555
    5656                echo "
    … …  
    215215                        else
    216216                                $value = $authors;
     217                        $value = attr($value);
    217218                        $blogtitle = js_escape( $blog['title'] );
    218219                        $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0;
    … …  
    663664                        $rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>";
    664665
    665                 return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&amp;noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>";
     666                return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&amp;noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='" . attr($importing_blog) . "' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>";
    666667        }
    667668
    … …  
    832833                        $restart = __('Restart');
    833834                        $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.');
    834                         $submit = __('Clear account information');
     835                        $submit = _a('Clear account information');
    835836                        echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&amp;noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>";
    836837                }

  • trunk/wp-admin/import/btt.php

    r10606 r11173  
    3636                echo '<form action="admin.php?import=btt&amp;step=1" method="post">';
    3737                wp_nonce_field('import-btt');
    38                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Tags').'" /></p>';
     38                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Import Tags').'" /></p>';
    3939                echo '</form>';
    4040                echo '</div>';
    … …  
    106106                echo '<form action="admin.php?import=btt&amp;step='.($precheck? 2:3).'" method="post">';
    107107                wp_nonce_field('import-btt');
    108                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>';
     108                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Next').'" /></p>';
    109109                echo '</form>';
    110110                echo '</div>';

  • trunk/wp-admin/import/dotclear.php

    r11109 r11173  
    216216                wp_nonce_field('import-dotclear');
    217217                $this->db_form();
    218                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.attr(__('Import Categories')).'" /></p>';
     218                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Import Categories').'" /></p>';
    219219                echo '</form></div>';
    220220        }
    … …  
    633633                echo '<form action="admin.php?import=dotclear&amp;step=2" method="post">';
    634634                wp_nonce_field('import-dotclear');
    635                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Users')));
     635                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Users'));
    636636                echo '</form>';
    637637
    … …  
    646646                echo '<form action="admin.php?import=dotclear&amp;step=3" method="post">';
    647647                wp_nonce_field('import-dotclear');
    648                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Posts')));
     648                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Posts'));
    649649                echo '</form>';
    650650        }
    … …  
    660660                echo '<form action="admin.php?import=dotclear&amp;step=4" method="post">';
    661661                wp_nonce_field('import-dotclear');
    662                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Comments')));
     662                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Comments'));
    663663                echo '</form>';
    664664        }
    … …  
    672672                echo '<form action="admin.php?import=dotclear&amp;step=5" method="post">';
    673673                wp_nonce_field('import-dotclear');
    674                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Links')));
     674                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Links'));
    675675                echo '</form>';
    676676        }
    … …  
    685685                echo '<form action="admin.php?import=dotclear&amp;step=6" method="post">';
    686686                wp_nonce_field('import-dotclear');
    687                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Finish')));
     687                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Finish'));
    688688                echo '</form>';
    689689        }

  • trunk/wp-admin/import/greymatter.php

    r10606 r11173  
    6767</tr>
    6868</table>
    69 <p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Start Importing') ?>" /></p>
     69<p class="submit"><input type="submit" name="submit" class="button" value="<?php _ea('Start Importing') ?>" /></p>
    7070</form>
    7171<?php

  • trunk/wp-admin/import/jkw.php

    r10606 r11173  
    3535                echo '<form action="admin.php?import=jkw&amp;step=1" method="post">';
    3636                wp_nonce_field('import-jkw');
    37                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Version 1.x').'" /></p>';
     37                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Import Version 1.x').'" /></p>';
    3838                echo '</form>';
    3939                echo '<form action="admin.php?import=jkw&amp;step=3" method="post">';
    4040                wp_nonce_field('import-jkw');
    41                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Version 2.0a').'" /></p>';
     41                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Import Version 2.0a').'" /></p>';
    4242                echo '</form>';
    4343                echo '</div>';
    … …  
    121121                echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 2:6).'" method="post">';
    122122                wp_nonce_field('import-jkw');
    123                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>';
     123                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Next').'" /></p>';
    124124                echo '</form>';
    125125                echo '</div>';
    … …  
    154154                echo '<form action="admin.php?import=jkw&amp;step='.($precheck? 4:5).'" method="post">';
    155155                wp_nonce_field('import-jkw');
    156                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>';
     156                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Next').'" /></p>';
    157157                echo '</form>';
    158158                echo '</div>';

  • trunk/wp-admin/import/livejournal.php

    r11150 r11173  
    182182                <?php wp_nonce_field( 'lj-api-import' ) ?>
    183183                <?php if ( get_option( 'ljapi_username' ) && get_option( 'ljapi_password' ) ) : ?>
    184                         <input type="hidden" name="step" value="<?php echo get_option( 'ljapi_step' ) ?>" />
     184                        <input type="hidden" name="step" value="<?php echo attr( get_option( 'ljapi_step' ) ) ?>" />
    185185                        <p><?php _e( 'It looks like you attempted to import your LiveJournal posts previously and got interrupted.' ) ?></p>
    186186                        <p class="submit">
    187                                 <input type="submit" class="button-primary" value="<?php echo attr( __( 'Continue previous import' ) ) ?>" />
     187                                <input type="submit" class="button-primary" value="<?php _ea( 'Continue previous import' ) ?>" />
    188188                        </p>
    189189                        <p class="submitbox"><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&amp;step=-1&amp;_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&amp;_wp_http_referer=' . attr( $_SERVER['REQUEST_URI'] )) ?>" class="deletion submitdelete"><?php _e( 'Cancel &amp; start a new import' ) ?></a></p>
    … …  
    224224
    225225                        <p class="submit">
    226                                 <input type="submit" class="button-primary" value="<?php echo attr( __( 'Connect to LiveJournal and Import' ) ) ?>" />
     226                                <input type="submit" class="button-primary" value="<?php _ea( 'Connect to LiveJournal and Import' ) ?>" />
    227227                        </p>
    228228
    … …  
    817817                        <?php wp_nonce_field( 'lj-api-import' ) ?>
    818818                        <input type="hidden" name="step" id="step" value="1" />
    819                         <p><input type="submit" class="button-primary" value="<?php echo attr( __( 'Import the next batch' ) ) ?>" /> <span id="auto-message"></span></p>
     819                        <p><input type="submit" class="button-primary" value="<?php _ea( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
    820820                        </form>
    821821                        <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
    … …  
    867867                        <?php wp_nonce_field( 'lj-api-import' ) ?>
    868868                        <input type="hidden" name="step" id="step" value="2" />
    869                         <p><input type="submit" class="button-primary" value="<?php echo attr( __( 'Import the next batch' ) ) ?>" /> <span id="auto-message"></span></p>
     869                        <p><input type="submit" class="button-primary" value="<?php _ea( 'Import the next batch' ) ?>" /> <span id="auto-message"></span></p>
    870870                        </form>
    871871                        <?php $this->auto_ajax( 'ljapi-auto-repost', 'auto-message', 0 ); ?>
    … …  
    942942                $str .= wp_nonce_field( 'lj-api-import', '_wpnonce', true, false );
    943943                $str .= wp_referer_field( false );
    944                 $str .= '<input type="hidden" name="step" id="step" value="' . $next_step . '" />';
     944                $str .= '<input type="hidden" name="step" id="step" value="' . attr($next_step) . '" />';
    945945                $str .= '<p><input type="submit" class="button-primary" value="' . attr( $label ) . '" /> <span id="auto-message"></span></p>';
    946946                $str .= '</form>';

  • trunk/wp-admin/import/mt.php

    r11109 r11173  
    4747<?php _e('Or use <code>mt-export.txt</code> in your <code>/wp-content/</code> directory'); ?></p>
    4848<p class="submit">
    49 <input type="submit" class="button" value="<?php echo attr(__('Import mt-export.txt')); ?>" />
     49<input type="submit" class="button" value="<?php _ea('Import mt-export.txt'); ?>" />
    5050</p>
    5151</form>
    … …  
    208208                foreach ($authors as $author) {
    209209                        ++ $j;
    210                         echo '<li><label>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
     210                        echo '<li><label>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'. attr($author) .'" name="'.'user[]'.'" maxlength="30"> <br />');
    211211                        $this->users_form($j);
    212212                        echo '</label></li>';
    213213                }
    214214
    215                 echo '<p class="submit"><input type="submit" class="button" value="'.__('Submit').'"></p>'.'<br />';
     215                echo '<p class="submit"><input type="submit" class="button" value="'._a('Submit').'"></p>'.'<br />';
    216216                echo '</form>';
    217217                echo '</ol></div>';

  • trunk/wp-admin/import/opml.php

    r10995 r11173  
    6565</select></p>
    6666
    67 <p class="submit"><input type="submit" name="submit" value="<?php _e('Import OPML File') ?>" /></p>
     67<p class="submit"><input type="submit" name="submit" value="<?php _ea('Import OPML File') ?>" /></p>
    6868</form>
    6969

  • trunk/wp-admin/import/stp.php

    r10606 r11173  
    3434                echo '<form action="admin.php?import=stp&amp;step=1" method="post">';
    3535                wp_nonce_field('import-stp');
    36                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 1').'" /></p>';
     36                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 1').'" /></p>';
    3737                echo '</form>';
    3838                echo '</div>';
    … …  
    9494                echo '<form action="admin.php?import=stp&amp;step=2" method="post">';
    9595                wp_nonce_field('import-stp');
    96                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 2').'" /></p>';
     96                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 2').'" /></p>';
    9797                echo '</form>';
    9898                echo '</div>';
    … …  
    110110                echo '<form action="admin.php?import=stp&amp;step=3" method="post">';
    111111                wp_nonce_field('import-stp');
    112                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>';
     112                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 3').'" /></p>';
    113113                echo '</form>';
    114114                echo '</div>';

  • trunk/wp-admin/import/textpattern.php

    r11109 r11173  
    7171                wp_nonce_field('import-textpattern');
    7272                $this->db_form();
    73                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.attr(__('Import')).'" /></p>';
     73                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Import').'" /></p>';
    7474                echo '</form>';
    7575                echo '</div>';
    … …  
    506506                echo '<form action="admin.php?import=textpattern&amp;step=2" method="post">';
    507507                wp_nonce_field('import-textpattern');
    508                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Users')));
     508                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Users'));
    509509                echo '</form>';
    510510
    … …  
    519519                echo '<form action="admin.php?import=textpattern&amp;step=3" method="post">';
    520520                wp_nonce_field('import-textpattern');
    521                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Posts')));
     521                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Posts'));
    522522                echo '</form>';
    523523        }
    … …  
    533533                echo '<form action="admin.php?import=textpattern&amp;step=4" method="post">';
    534534                wp_nonce_field('import-textpattern');
    535                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Comments')));
     535                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Comments'));
    536536                echo '</form>';
    537537        }
    … …  
    545545                echo '<form action="admin.php?import=textpattern&amp;step=5" method="post">';
    546546                wp_nonce_field('import-textpattern');
    547                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Import Links')));
     547                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Import Links'));
    548548                echo '</form>';
    549549        }
    … …  
    558558                echo '<form action="admin.php?import=textpattern&amp;step=6" method="post">';
    559559                wp_nonce_field('import-textpattern');
    560                 printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', attr(__('Finish')));
     560                printf('<p class="submit"><input type="submit" name="submit" class="button" value="%s" /></p>', _a('Finish'));
    561561                echo '</form>';
    562562        }

  • trunk/wp-admin/import/utw.php

    r10606 r11173  
    3434                echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>';
    3535                echo '<form action="admin.php?import=utw&amp;step=1" method="post">';
    36                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 1').'" /></p>';
     36                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 1').'" /></p>';
    3737                echo '</form>';
    3838                echo '</div>';
    … …  
    121121                echo '<form action="admin.php?import=utw&amp;step=2" method="post">';
    122122                wp_nonce_field('import-utw');
    123                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 2').'" /></p>';
     123                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 2').'" /></p>';
    124124                echo '</form>';
    125125                echo '</div>';
    … …  
    157157                echo '<form action="admin.php?import=utw&amp;step=3" method="post">';
    158158                wp_nonce_field('import-utw');
    159                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 3').'" /></p>';
     159                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 3').'" /></p>';
    160160                echo '</form>';
    161161                echo '</div>';
    … …  
    176176                echo '<form action="admin.php?import=utw&amp;step=4" method="post">';
    177177                wp_nonce_field('import-utw');
    178                 echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Step 4').'" /></p>';
     178                echo '<p class="submit"><input type="submit" name="submit" class="button" value="'._a('Step 4').'" /></p>';
    179179                echo '</form>';
    180180                echo '</div>';

  • trunk/wp-admin/import/wordpress.php

    r11109 r11173  
    234234
    235235                echo '<p class="submit">';
    236                 echo '<input type="submit" class="button" value="'.attr( __('Submit') ).'" />'.'<br />';
     236                echo '<input type="submit" class="button" value="'. _a('Submit') .'" />'.'<br />';
    237237                echo '</p>';
    238238                echo '</form>';
    … …  
    243243
    244244                if ( $this->allow_create_users() ) {
    245                         printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30" /></label> <br />');
     245                        printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'. attr($author) .'" name="'.'user_create['.intval($n).']'.'" maxlength="30" /></label> <br />');
    246246                }
    247247                else {
    … …  
    250250
    251251                // keep track of $n => $author name
    252                 echo '<input type="hidden" name="author_in['.intval($n).']" value="'.htmlspecialchars($author).'" />';
     252                echo '<input type="hidden" name="author_in['.intval($n).']" value="'.attr($author).'" />';
    253253
    254254                $users = get_users_of_blog();

  • trunk/wp-admin/import/wp-cat2tag.php

    r11109 r11173  
    104104
    105105<form name="catlist" id="catlist" action="admin.php?import=wp-cat2tag&amp;step=2" method="post">
    106 <p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_rows()" />
     106<p><input type="button" class="button-secondary" value="<?php _ea('Check All'); ?>" onclick="this.value=check_all_rows()" />
    107107<?php wp_nonce_field('import-cat2tag'); ?></p>
    108108<ul style="list-style:none">
    … …  
    129129                        echo '<p><a name="note"></a>' . __('* This category is also a tag. Converting it will add that tag to all posts that are currently in the category.') . '</p>'; ?>
    130130
    131 <p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Convert Categories to Tags'); ?>" /></p>
     131<p class="submit"><input type="submit" name="submit" class="button" value="<?php _ea('Convert Categories to Tags'); ?>" /></p>
    132132</form>
    133133
    … …  
    180180
    181181<form name="taglist" id="taglist" action="admin.php?import=wp-cat2tag&amp;step=4" method="post">
    182 <p><input type="button" class="button-secondary" value="<?php _e('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
     182<p><input type="button" class="button-secondary" value="<?php _ea('Check All'); ?>" onclick="this.value=check_all_tagrows()" />
    183183<?php wp_nonce_field('import-cat2tag'); ?></p>
    184184<ul style="list-style:none">
    … …  
    193193                        echo '<p><a name="note"></a>' . __('* This tag is also a category. When converted, all posts associated with the tag will also be in the category.') . '</p>'; ?>
    194194
    195 <p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _e('Convert Tags to Categories'); ?>" /></p>
     195<p class="submit"><input type="submit" name="submit_tags" class="button" value="<?php _ea('Convert Tags to Categories'); ?>" /></p>
    196196</form>
    197197

  • trunk/wp-admin/includes/dashboard.php

    r11131 r11173  
    133133        echo '<form action="" method="post" class="dashboard-widget-control-form">';
    134134        wp_dashboard_trigger_widget_control( $meta_box['id'] );
    135         echo "<p class='submit'><input type='hidden' name='widget_id' value='$meta_box[id]' /><input type='submit' value='" . __( 'Submit' ) . "' /></p>";
     135        echo "<p class='submit'><input type='hidden' name='widget_id' value='" . attr($meta_box['id']) . "' /><input type='submit' value='" . _a( 'Submit' ) . "' /></p>";
    136136
    137137        echo '</form>';
    … …  
    414414                        <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" />
    415415                        <?php wp_nonce_field('add-post'); ?>
    416                         <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php _e('Save Draft'); ?>" />
    417                         <input type="reset" value="<?php _e( 'Reset' ); ?>" class="button" />
     416                        <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php _ea('Save Draft'); ?>" />
     417                        <input type="reset" value="<?php _ea( 'Reset' ); ?>" class="button" />
    418418                        <?php if ( current_user_can('publish_posts') ) { ?>
    419                         <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Publish'); ?>" />
     419                        <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _ea('Publish'); ?>" />
    420420                        <?php } else { ?>
    421                         <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Submit for Review'); ?>" />
     421                        <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _ea('Submit for Review'); ?>" />
    422422                        <?php } ?>
    423423                        <br class="clear" />

  • trunk/wp-admin/includes/file.php

    r11168 r11173  
    774774<?php endif; ?>
    775775<p class="submit">
    776 <input id="upgrade" name="upgrade" type="submit" class="button" value="<?php _e('Proceed'); ?>" />
     776<input id="upgrade" name="upgrade" type="submit" class="button" value="<?php _ea('Proceed'); ?>" />
    777777</p>
    778778</div>

  • trunk/wp-admin/includes/media.php

    r11152 r11173  
    752752        $out = array();
    753753        foreach ($alignments as $name => $label) {
    754 
     754                $name = attr($name);
    755755                $out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
    756756                        ( $checked == $name ? " checked='checked'" : "" ) .
    … …  
    11571157        $delete_href = wp_nonce_url("post.php?action=delete-post&amp;post=$attachment_id", 'delete-post_' . $attachment_id);
    11581158        if ( $send )
    1159                 $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . attr( __( 'Insert into Post' ) ) . "' />";
     1159                $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . _a( 'Insert into Post' ) . "' />";
    11601160        if ( $delete )
    11611161                $delete = "<a href=\"#\" class=\"del-link\" onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __('Delete') . "</a>";
    … …  
    14141414?>
    14151415</div>
    1416 <input type="submit" class="button savebutton" name="save" value="<?php echo attr( __( 'Save all changes' ) ); ?>" />
     1416<input type="submit" class="button savebutton" name="save" value="<?php _ea( 'Save all changes' ); ?>" />
    14171417<?php
    14181418}
    … …  
    15871587
    15881588<p class="ml-submit">
    1589 <input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php echo attr( __( 'Save all changes' ) ); ?>" />
     1589<input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php _ea( 'Save all changes' ); ?>" />
    15901590<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
    15911591<input type="hidden" name="type" value="<?php echo attr( $GLOBALS['type'] ); ?>" />
    … …  
    16641664
    16651665<p class="ml-submit">
    1666 <input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php echo attr( __( 'Insert gallery' ) ); ?>" />
    1667 <input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php echo attr( __( 'Update gallery settings' ) ); ?>" />
     1666<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php _ea( 'Insert gallery' ); ?>" />
     1667<input type="button" class="button" style="display:none;" onmousedown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php _ea( 'Update gallery settings' ); ?>" />
    16681668</p>
    16691669</div>
    … …  
    17091709        <label class="hidden" for="media-search-input"><?php _e('Search Media');?>:</label>
    17101710        <input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
    1711         <input type="submit" value="<?php echo attr( __( 'Search Media' ) ); ?>" class="button" />
     1711        <input type="submit" value="<?php _ea( 'Search Media' ); ?>" class="button" />
    17121712</p>
    17131713
    … …  
    18261826</div>
    18271827<p class="ml-submit">
    1828 <input type="submit" class="button savebutton" name="save" value="<?php echo attr( __( 'Save all changes' ) ); ?>" />
     1828<input type="submit" class="button savebutton" name="save" value="<?php _ea( 'Save all changes' ); ?>" />
    18291829<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
    18301830</p>
    … …  
    19081908                        <td></td>
    19091909                        <td>
    1910                                 <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . attr(__('Insert into Post')) . '" />
     1910                                <input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . _a('Insert into Post') . '" />
    19111911                        </td>
    19121912                </tr>
    … …  
    19441944                        <td></td>
    19451945                        <td>
    1946                                 <input type="submit" class="button" name="insertonlybutton" value="' . attr(__('Insert into Post')) . '" />
     1946                                <input type="submit" class="button" name="insertonlybutton" value="' . _a('Insert into Post') . '" />
    19471947                        </td>
    19481948                </tr>
    … …  
    19791979                        <td></td>
    19801980                        <td>
    1981                                 <input type="submit" class="button" name="insertonlybutton" value="' . attr(__('Insert into Post')) . '" />
     1981                                <input type="submit" class="button" name="insertonlybutton" value="' . _a('Insert into Post') . '" />
    19821982                        </td>
    19831983                </tr>
    … …  
    20142014                        <td></td>
    20152015                        <td>
    2016                                 <input type="submit" class="button" name="insertonlybutton" value="' . attr(__('Insert into Post')) . '" />
     2016                                <input type="submit" class="button" name="insertonlybutton" value="' . _a('Insert into Post') . '" />
    20172017                        </td>
    20182018                </tr>

  • trunk/wp-admin/includes/plugin-install.php

    r11152 r11173  
    214214                <label class="hidden" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
    215215                <input type="file" id="pluginzip" name="pluginzip" />
    216                 <input type="submit" class="button" value="<?php _e('Install Now') ?>" />
     216                <input type="submit" class="button" value="<?php _ea('Install Now') ?>" />
    217217        </form>
    218218<?php

  • trunk/wp-admin/includes/plugin.php

    r11168 r11173  
    11131113 */
    11141114function settings_fields($option_group) {
    1115         echo "<input type='hidden' name='option_page' value='$option_group' />";
     1115        echo "<input type='hidden' name='option_page' value='" . attr($option_group) . "' />";
    11161116        echo '<input type="hidden" name="action" value="update" />';
    11171117        wp_nonce_field("$option_group-options");

  • trunk/wp-admin/includes/template.php

    r11166 r11173  
    23052305        <input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
    23062306        <input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
    2307         <input type="hidden" name="mode" id="mode" value="<?php echo $mode; ?>" />
     2307        <input type="hidden" name="mode" id="mode" value="<?php echo attr($mode); ?>" />
    23082308        <?php wp_nonce_field( 'replyto-comment', '_ajax_nonce', false ); ?>
    23092309        <?php wp_comment_form_unfiltered_html_nonce(); ?>
    … …  
    24372437
    24382438        $r .= "\n\t\t<div class='submit'><input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
    2439         $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='".attr(__( 'Delete' ))."' />";
    2440         $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='".attr(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /></div>";
     2439        $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='". _a( 'Delete' ) ."' />";
     2440        $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". _a( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /></div>";
    24412441        $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
    24422442        $r .= "</td>";
    … …  
    24872487        foreach ( $keys as $key ) {
    24882488                $key = attr( $key );
    2489                 echo "\n<option value='$key'>$key</option>";
     2489                echo "\n<option value='" . attr($key) . "'>$key</option>";
    24902490        }
    24912491?>
    … …  
    25032503
    25042504<tr><td colspan="2" class="submit">
    2505 <input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _e( 'Add Custom Field' ) ?>" />
     2505<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php _ea( 'Add Custom Field' ) ?>" />
    25062506<?php wp_nonce_field( 'add-meta', '_ajax_nonce', false ); ?>
    25072507</td></tr>
    … …  
    27232723                $name = translate_user_role($details['name'] );
    27242724                if ( $selected == $role ) // Make default first in list
    2725                         $p = "\n\t<option selected='selected' value='$role'>$name</option>";
     2725                        $p = "\n\t<option selected='selected' value='" . attr($role) . "'>$name</option>";
    27262726                else
    2727                         $r .= "\n\t<option value='$role'>$name</option>";
     2727                        $r .= "\n\t<option value='" . attr($role) . "'>$name</option>";
    27282728        }
    27292729        echo $p . $r;
    … …  
    28052805</p>
    28062806<p class="submit">
    2807 <input type="submit" class="button" value="<?php _e( 'Upload file and import' ); ?>" />
     2807<input type="submit" class="button" value="<?php _ea( 'Upload file and import' ); ?>" />
    28082808</p>
    28092809</form>
    … …  
    31583158                        <div class="find-box-search">
    31593159                                <?php if ( $found_action ) { ?>
    3160                                         <input type="hidden" name="found_action" value="<?php echo $found_action; ?>" />
     3160                                        <input type="hidden" name="found_action" value="<?php echo attr($found_action); ?>" />
    31613161                                <?php } ?>
    31623162
    … …  
    31653165                                <label class="hidden" for="find-posts-input"><?php _e( 'Search' ); ?></label>
    31663166                                <input type="text" id="find-posts-input" name="ps" value="" />
    3167                                 <input type="button" onclick="findPosts.send();" value="<?php _e( 'Search' ); ?>" class="button" /><br />
     3167                                <input type="button" onclick="findPosts.send();" value="<?php _ea( 'Search' ); ?>" class="button" /><br />
    31683168
    31693169                                <input type="radio" name="find-posts-what" id="find-posts-posts" checked="checked" value="posts" />
    … …  
    31753175                </div>
    31763176                <div class="find-box-buttons">
    3177                         <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php _e('Close'); ?>" />
    3178                         <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php _e('Select'); ?>" />
     3177                        <input type="button" class="button alignleft" onclick="findPosts.close();" value="<?php _ea('Close'); ?>" />
     3178                        <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php _ea('Select'); ?>" />
    31793179                </div>
    31803180        </div>
    … …  
    36473647        if ( !empty($per_page_label) )
    36483648                $return .= "<label for='$option'>$per_page_label</label> <input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' />\n";
    3649         $return .= "<input type='submit' class='button' value='" . __('Apply') . "' />";
    3650         $return .= "<input type='hidden' name='wp_screen_options[option]' value='$option' />";
     3649        $return .= "<input type='submit' class='button' value='" . _a('Apply') . "' />";
     3650        $return .= "<input type='hidden' name='wp_screen_options[option]' value='" . attr($option) . "' />";
    36513651        $return .= "</div>\n";
    36523652        return $return;

  • trunk/wp-admin/includes/theme-install.php

    r11109 r11173  
    160160        </select>
    161161        <input type="text" name="s" size="30" value="<?php echo attr($term) ?>" />
    162         <input type="submit" name="search" value="<?php echo attr(__('Search')); ?>" class="button" />
     162        <input type="submit" name="search" value="<?php _ea('Search'); ?>" class="button" />
    163163</form>
    164164<?php
    … …  
    219219</div>
    220220<br class="clear" />
    221 <input type="submit" name="search" value="<?php echo attr(__('Find Themes')); ?>" class="button" />
     221<input type="submit" name="search" value="<?php _ea('Find Themes'); ?>" class="button" />
    222222</form>
    223223<?php
    … …  
    282282        <input type="file" name="themezip" />
    283283        <input type="submit"
    284         class="button" value="<?php _e('Install Now') ?>" />
     284        class="button" value="<?php _ea('Install Now') ?>" />
    285285</form>
    286286        <?php

  • trunk/wp-admin/includes/widgets.php

    r11166 r11173  
    184184                echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n"; ?>
    185185
    186         <input type="hidden" name="widget-id" class="widget-id" value="<?php echo $id_format; ?>" />
    187         <input type="hidden" name="id_base" class="id_base" value="<?php echo $id_base; ?>" />
    188         <input type="hidden" name="widget-width" class="widget-width" value="<?php echo $control['width']; ?>" />
    189         <input type="hidden" name="widget-height" class="widget-height" value="<?php echo $control['height']; ?>" />
    190         <input type="hidden" name="widget_number" class="widget_number" value="<?php echo $widget_number; ?>" />
    191         <input type="hidden" name="multi_number" class="multi_number" value="<?php echo $multi_number; ?>" />
    192         <input type="hidden" name="add_new" class="add_new" value="<?php echo $add_new; ?>" />
     186        <input type="hidden" name="widget-id" class="widget-id" value="<?php echo attr($id_format); ?>" />
     187        <input type="hidden" name="id_base" class="id_base" value="<?php echo $attr(id_base); ?>" />
     188        <input type="hidden" name="widget-width" class="widget-width" value="<?php echo attr($control['width']); ?>" />
     189        <input type="hidden" name="widget-height" class="widget-height" value="<?php echo attr($control['height']); ?>" />
     190        <input type="hidden" name="widget_number" class="widget_number" value="<?php echo attr($widget_number); ?>" />
     191        <input type="hidden" name="multi_number" class="multi_number" value="<?php echo attr($multi_number); ?>" />
     192        <input type="hidden" name="add_new" class="add_new" value="<?php echo attr($add_new); ?>" />
    193193
    194194        <div class="widget-control-actions">
    195195                <a class="button widget-control-remove alignleft" href="<?php echo $edit ? clean_url( add_query_arg( array( 'remove' => $id_format, 'key' => $key, '_wpnonce' => $nonce ) ) ) : '#remove'; ?>"><?php _e('Remove'); ?></a>
    196196<?php           if ( 'noform' !== $has_form ) { ?>
    197                 <input type="submit" name="savewidget" class="button-primary widget-control-save alignright" value="<?php _e('Save'); ?>" />
     197                <input type="submit" name="savewidget" class="button-primary widget-control-save alignright" value="<?php _ea('Save'); ?>" />
    198198<?php           } ?>
    199199                <br class="clear" />

  • trunk/wp-admin/press-this.php

    r11150 r11173  
    383383                                        if ( preg_match("/youtube\.com\/watch/i", $url) ) {
    384384                                                list($domain, $video_id) = split("v=", $url);
     385                                                $video_id = attr($video_id);
    385386                                                $content = '<object width="425" height="350"><param name="movie" value="http://www.youtube.com/v/' . $video_id . '"></param><param name="wmode" value="transparent"></param><embed src="http://www.youtube.com/v/' . $video_id . '" type="application/x-shockwave-flash" wmode="transparent" width="425" height="350"></embed></object>';
    386387
    387388                                        } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) {
    388389                                                list($domain, $video_id) = split(".com/", $url);
     390                                                $video_id = attr($video_id);
    389391                                                $content = '<object width="400" height="225"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" />      <embed src="http://www.vimeo.com/moogaloop.swf?clip_id=' . $video_id . '&amp;server=www.vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="225"></embed></object>';
    390392

  • trunk/wp-admin/theme-editor.php

    r11110 r11173  
    9797                        $docs_select .= '<option value="">' . _a( 'Function Name...' ) . '</option>';
    9898                        foreach ( $functions as $function ) {
    99                                 $docs_select .= '<option value="' . urlencode( $function ) . '">' . htmlspecialchars( $function ) . '()</option>';
     99                                $docs_select .= '<option value="' . attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
    100100                        }
    101101                        $docs_select .= '</select>';

  • trunk/wp-content/themes/classic/comments-popup.php

    r11109 r11173  
    6868<?php else : ?>
    6969        <p>
    70           <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
     70          <input type="text" name="author" id="author" class="textarea" value="<?php echo attr($comment_author); ?>" size="28" tabindex="1" />
    7171           <label for="author"><?php _e("Name"); ?></label>
    7272        </p>
    7373
    7474        <p>
    75           <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
     75          <input type="text" name="email" id="email" value="<?php echo attr($comment_author_email); ?>" size="28" tabindex="2" />
    7676           <label for="email"><?php _e("E-mail"); ?></label>
    7777        </p>
    7878
    7979        <p>
    80           <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
     80          <input type="text" name="url" id="url" value="<?php echo attr($comment_author_url); ?>" size="28" tabindex="3" />
    8181           <label for="url"><?php _e("<abbr title=\"Universal Resource Locator\">URL</abbr>"); ?></label>
    8282        </p>
    … …  
    9292          <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
    9393          <input type="hidden" name="redirect_to" value="<?php echo attr($_SERVER["REQUEST_URI"]); ?>" />
    94           <input name="submit" type="submit" tabindex="5" value="<?php _e("Say It!"); ?>" />
     94          <input name="submit" type="submit" tabindex="5" value="<?php _ea("Say It!"); ?>" />
    9595        </p>
    9696        <?php do_action('comment_form', $post->ID); ?>

  • trunk/wp-content/themes/classic/comments.php

    r11109 r11173  
    5454<?php else : ?>
    5555
    56 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
     56<p><input type="text" name="author" id="author" value="<?php echo attr($comment_author); ?>" size="22" tabindex="1" />
    5757<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
    5858
    59 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
     59<p><input type="text" name="email" id="email" value="<?php echo attr($comment_author_email); ?>" size="22" tabindex="2" />
    6060<label for="email"><small><?php _e('Mail (will not be published)');?> <?php if ($req) _e('(required)'); ?></small></label></p>
    6161
    62 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
     62<p><input type="text" name="url" id="url" value="<?php echo attr($comment_author_url); ?>" size="22" tabindex="3" />
    6363<label for="url"><small><?php _e('Website'); ?></small></label></p>
    6464
    … …  
    6969<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
    7070
    71 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php echo attr(__('Submit Comment')); ?>" />
     71<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _ea('Submit Comment'); ?>" />
    7272<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
    7373</p>

  • trunk/wp-content/themes/classic/sidebar.php

    r8999 r11173  
    1919        <div>
    2020                <input type="text" name="s" id="s" size="15" /><br />
    21                 <input type="submit" value="<?php _e('Search'); ?>" />
     21                <input type="submit" value="<?php _ea('Search'); ?>" />
    2222        </div>
    2323        </form>

  • trunk/wp-content/themes/default/comments-popup.php

    r11109 r11173  
    6767<?php else : ?>
    6868        <p>
    69           <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
     69          <input type="text" name="author" id="author" class="textarea" value="<?php echo attr($comment_author); ?>" size="28" tabindex="1" />
    7070           <label for="author">Name</label>
    7171        </p>
    7272
    7373        <p>
    74           <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
     74          <input type="text" name="email" id="email" value="<?php echo attr($comment_author_email); ?>" size="28" tabindex="2" />
    7575           <label for="email">E-mail</label>
    7676        </p>
    7777
    7878        <p>
    79           <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
     79          <input type="text" name="url" id="url" value="<?php echo attr($comment_author_url); ?>" size="28" tabindex="3" />
    8080           <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
    8181        </p>

  • trunk/wp-content/themes/default/comments.php

    r11067 r11173  
    6969<?php else : ?>
    7070
    71 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
     71<p><input type="text" name="author" id="author" value="<?php echo attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
    7272<label for="author"><small>Name <?php if ($req) echo "(required)"; ?></small></label></p>
    7373
    74 <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
     74<p><input type="text" name="email" id="email" value="<?php echo attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
    7575<label for="email"><small>Mail (will not be published) <?php if ($req) echo "(required)"; ?></small></label></p>
    7676
    77 <p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
     77<p><input type="text" name="url" id="url" value="<?php echo attr($comment_author_url); ?>" size="22" tabindex="3" />
    7878<label for="url"><small>Website</small></label></p>
    7979

  • trunk/wp-content/themes/default/functions.php

    r11109 r11173  
    167167        }
    168168        function PopupWindow_populate(contents) {
    169                 contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" class="button-secondary" value="<?php echo attr(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
     169                contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" class="button-secondary" value="<?php _ea('Close Color Picker'); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>';
    170170                this.contents = contents;
    171171                this.populated = false;
    … …  
    381381                        <form method="post" action="">
    382382                                <?php wp_nonce_field('kubrick-header'); ?>
    383                                 <div class="zerosize"><input type="submit" name="defaultsubmit" value="<?php echo attr(__('Save')); ?>" /></div>
     383                                <div class="zerosize"><input type="submit" name="defaultsubmit" value="<?php _ea('Save'); ?>" /></div>
    384384                                        <label for="njfontcolor"><?php _e('Font Color:'); ?></label><input type="text" name="njfontcolor" id="njfontcolor" value="<?php echo attr(kubrick_header_color()); ?>" /> <?php printf(__('Any CSS color (%s or %s or %s)'), '<code>red</code>', '<code>#FF0000</code>', '<code>rgb(255, 0, 0)</code>'); ?><br />
    385385                                        <label for="njuppercolor"><?php _e('Upper Color:'); ?></label><input type="text" name="njuppercolor" id="njuppercolor" value="#<?php echo attr(kubrick_upper_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
    386386                                <label for="njlowercolor"><?php _e('Lower Color:'); ?></label><input type="text" name="njlowercolor" id="njlowercolor" value="#<?php echo attr(kubrick_lower_color()); ?>" /> <?php printf(__('HEX only (%s or %s)'), '<code>#FF0000</code>', '<code>#F00</code>'); ?><br />
    387387                                <input type="hidden" name="hi" id="hi" value="<?php echo attr(kubrick_header_image()); ?>" />
    388                                 <input type="submit" name="toggledisplay" id="toggledisplay" value="<?php echo attr(__('Toggle Text')); ?>" />
    389                                 <input type="submit" name="defaults" value="<?php echo attr(__('Use Defaults')); ?>" />
    390                                 <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _e('Save'); ?>&nbsp;&nbsp;" />
     388                                <input type="submit" name="toggledisplay" id="toggledisplay" value="<?php _ea('Toggle Text'); ?>" />
     389                                <input type="submit" name="defaults" value="<?php _ea('Use Defaults'); ?>" />
     390                                <input type="submit" class="defbutton" name="submitform" value="&nbsp;&nbsp;<?php _ea('Save'); ?>&nbsp;&nbsp;" />
    391391                                <input type="hidden" name="action" value="save" />
    392392                                <input type="hidden" name="njform" value="true" />
    … …  
    396396                        <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attr($_SERVER['REQUEST_URI']); ?>">
    397397                                <?php wp_nonce_field('kubrick-header'); ?>
    398         <input type="button"  class="button-secondary" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attr(__('Font Color')); ?>"></input>
    399                 <input type="button" class="button-secondary" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attr(__('Upper Color')); ?>"></input>
    400                 <input type="button" class="button-secondary" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attr(__('Lower Color')); ?>"></input>
    401                                 <input type="button" class="button-secondary" name="revert" value="<?php echo attr(__('Revert')); ?>" onclick="kRevert()" />
    402                                 <input type="button" class="button-secondary" value="<?php echo attr(__('Advanced')); ?>" onclick="toggleAdvanced()" />
     398        <input type="button"  class="button-secondary" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php _ea('Font Color'); ?>"></input>
     399                <input type="button" class="button-secondary" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php _ea('Upper Color'); ?>"></input>
     400                <input type="button" class="button-secondary" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php _ea('Lower Color'); ?>"></input>
     401                                <input type="button" class="button-secondary" name="revert" value="<?php _ea('Revert'); ?>" onclick="kRevert()" />
     402                                <input type="button" class="button-secondary" value="<?php _ea('Advanced'); ?>" onclick="toggleAdvanced()" />
    403403                                <input type="hidden" name="action" value="save" />
    404404                                <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attr(kubrick_header_display()); ?>" />
    … …  
    407407                                <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attr(kubrick_lower_color()); ?>" />
    408408                                <input type="hidden" name="headerimage" id="headerimage" value="<?php echo attr(kubrick_header_image()); ?>" />
    409                                 <p class="submit"><input type="submit" name="submitform" class="button-primary" value="<?php echo attr(__('Update Header')); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
     409                                <p class="submit"><input type="submit" name="submitform" class="button-primary" value="<?php _ea('Update Header'); ?>" onclick="cp.hidePopup('prettyplease')" /></p>
    410410                        </form>
    411411                        <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div>
    … …  
    416416                                        <label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attr(kubrick_upper_color()); ?>" /><br />
    417417                                        <label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attr(kubrick_lower_color()); ?>" /><br />
    418                                         <input type="button" class="button-secondary" name="default" value="<?php echo attr(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br />
    419                                         <input type="button" class="button-secondary" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attr(__('Toggle Text Display')); ?>"></input><br />
     418                                        <input type="button" class="button-secondary" name="default" value="<?php _ea('Select Default Colors'); ?>" onclick="kDefaults()" /><br />
     419                                        <input type="button" class="button-secondary" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php _ea('Toggle Text Display'); ?>"></input><br />
    420420                                </form>
    421421                        </div>

  • trunk/wp-includes/default-widgets.php

    r11160 r11173  
    853853        $number = attr( $number );
    854854        $title  = attr( $title );
    855         $url    = attr( $url );
     855        $url    = clean_url( $url );
    856856        $items  = (int) $items;
    857857        if ( $items < 1 || 20 < $items )

  • trunk/wp-includes/general-template.php

    r11171 r11173  
    122122        <div><label class="hidden" for="s">' . __('Search for:') . '</label>
    123123        <input type="text" value="' . attr(apply_filters('the_search_query', get_search_query())) . '" name="s" id="s" />
    124         <input type="submit" id="searchsubmit" value="'.attr(__('Search')).'" />
     124        <input type="submit" id="searchsubmit" value="'. _a('Search') .'" />
    125125        </div>
    126126        </form>';

  • trunk/wp-includes/post-template.php

    r11112 r11173  
    708708                        $output .= "\t<option value=\"-1\">$show_option_no_change</option>";
    709709                if ( $show_option_none )
    710                         $output .= "\t<option value=\"$option_none_value\">$show_option_none</option>\n";
     710                        $output .= "\t<option value=\"" . attr($option_none_value) . "\">$show_option_none</option>\n";
    711711                $output .= walk_page_dropdown_tree($pages, $depth, $r);
    712712                $output .= "</select>\n";
    … …  
    11351135        $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
    11361136        <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
    1137         <p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . __("Submit") . '" /></p>
     1137        <p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . _a("Submit") . '" /></p>
    11381138        </form>
    11391139        ';
    … …  
    13171317<div class="tablenav">
    13181318        <div class="alignleft">
    1319                 <input type="submit" class="button-secondary" value="<?php _e( 'Compare Revisions' ); ?>" />
     1319                <input type="submit" class="button-secondary" value="<?php _ea( 'Compare Revisions' ); ?>" />
    13201320                <input type="hidden" name="action" value="diff" />
    13211321        </div>
Note: See TracChangeset for help on using the changeset viewer.