WordPress.org

Make WordPress Core

Changes from tags/2.6.1 at r8652 to tags/2.6 at r8652


Ignore:
Location:
tags
Files:
1 deleted
78 edited

Legend:

Unmodified
Added
Removed
  • tags/2.6/readme.html

    r8652 r8652  
    99<h1 id="logo" style="text-align: center">
    1010    <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
    11     <br /> Version 2.6.1
     11    <br /> Version 2.6
    1212</h1>
    1313<p style="text-align: center">Semantic Personal Publishing Platform</p>
     
    3030<h1>Upgrading</h1>
    3131<p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p>
    32 <h2>Upgrading from any previous WordPress to 2.6.1:</h2>
     32<h2>Upgrading from any previous WordPress to 2.6:</h2>
    3333<ol>
    3434    <li>Delete your old WP files, saving ones you've modified.</li>
  • tags/2.6/wp-admin/admin-ajax.php

    r8652 r8652  
    393393    list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 );
    394394
    395     if ( get_option('show_avatars') )
    396         add_filter( 'comment_author', 'floated_admin_avatar' );
    397 
    398395    if ( !$comments )
    399396        die('1');
     
    402399        get_comment( $comment );
    403400        ob_start();
    404             _wp_comment_row( $comment->comment_ID, $mode, $status );
     401            _wp_comment_row( $comment->comment_ID, $mode, false );
    405402            $comment_list_item = ob_get_contents();
    406403        ob_end_clean();
  • tags/2.6/wp-admin/admin-header.php

    r8652 r8652  
    7575
    7676<?php
    77 if ( ! $is_opera ) {
     77$gears_compat = false;
     78
     79if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) {
     80    $gears_compat = true;
    7881?>
    7982    <div id="gears-info-box" class="info-box" style="display:none;">
     
    9194    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
    9295    <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p>
    93     <p><?php
    94    
    95     if ( $is_safari )
    96         _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
    97     else
    98         _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.');
    99    
    100     ?></p>
     96    <p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p>
    10197    <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
    10298    <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
     
    106102    <div id="gears-msg3" style="display:none;">
    107103    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
    108     <p><?php
    109    
    110     if ( $is_safari )
    111         _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
    112     else
    113         _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.');
    114    
    115     ?></p>
     104    <p><?php _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p>
    116105    <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>
    117106    <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
     
    119108    </div>
    120109    </div>
     110
    121111<?php } ?>
    122112
    123 <div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
     113<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( $gears_compat ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
    124114
    125115<?php
  • tags/2.6/wp-admin/css/colors-classic-rtl.css

    r8652 r8652  
    1 .post-com-count {
     1#poststuff .closed .togbox, #poststuff .togbox {
     2background-image: url(../images/toggle-arrow-rtl.gif) !important;
    23}
    3 #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
    4     background-image: url(../images/comment-stalk-rtl.gif);
    5     background-position:right bottom;
    6 }
    7 #footer {
    8     background-position:99% 10px;
    9 }
    10 #poststuff .closed .togbox, #poststuff .togbox {
    11     background-image: url(../images/toggle-arrow-rtl.gif) !important;
    12 }
    13 .bar {
    14     border-right-color: transparent;
    15     border-left-color: #99d;
    16 }
    17 .plugins .togl {
    18     border-right-color: transparent;
    19     border-left-color: #ccc;
    20 }
    21 #upload-menu li.current {
    22     border-right-color: transparent;
    23     border-left-color: #448abd;
    24 }
  • tags/2.6/wp-admin/css/colors-fresh-rtl.css

    r8652 r8652  
    1 .bar {
    2     border-right-color: transparent;
    3     border-left-color: #99d;
     1#poststuff .closed .togbox, #poststuff .togbox {
     2background-image: url(../images/toggle-arrow-rtl.gif) !important;
    43}
    5 .post-com-count {
    6 }
    7 #adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins {
    8     background-image: url(../images/comment-stalk-rtl.gif);
    9     background-position:right bottom;
    10 }
    11 #footer {
    12     background-position:99% 10px;
    13 }
    14 .plugins .togl {
    15     border-right-color: transparent;
    16     border-left-color: #ccc;
    17 }
    18 #poststuff .closed .togbox, #poststuff .togbox {
    19     background-image: url(../images/toggle-arrow-rtl.gif);
    20 }
    21 #upload-menu li.current {
    22     border-right-color:transparent;
    23     border-left-color: #448abd;
    24 }
  • tags/2.6/wp-admin/css/dashboard-rtl.css

    r8652 r8652  
    1 /* Right Now */
    21#rightnow {
    3     margin-right:0;
    4     margin-left: 7px;
     2    margin-left: 15px;
    53}
     4
    65#rightnow .reallynow span {
    76    text-align: right;
    87    float: right;
    98}
     9
    1010#rightnow .reallynow a {
    1111    text-align: left;
     
    1313    margin: 1px 0 0 6px;
    1414}
    15 /* Widgets */
    16 div#dashboard-widgets-wrap {
    17     margin-right:0;
    18     margin-left:-13px;
     15
     16div.dashboard-widget-holder {
     17    float: right;
    1918}
    20 div.dashboard-widget-holder {
    21     float:right;
    22 }
    23 div.dashboard-widget {
    24     margin-right:0;
    25     margin-left: 20px;
    26 }
     19
    2720h3.dashboard-widget-title span {
    2821    text-align: right;
    2922    float: right;
    3023}
     24
     25div.dashboard-widget-submit input {
     26    font-family: sans-serif !important;
     27}
     28   
     29#dashboard-widgets .widget_rss ul li a {
     30    float:right;
     31    font-weight:bold;
     32    margin:0pt 0pt 0.2em 0.5em;
     33}
     34
     35#dashboard-widgets .widget_rss ul li span.rss-date {
     36    float: right;
     37}
     38
    3139h3.dashboard-widget-title small {
    3240    text-align: left;
    33     float:left;
     41    float: left;
    3442}
    35 div.dashboard-widget-submit input  {
    36     font-family: Tahoma;
    37 }
    38 div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl {
     43div.dashboard-widget-content ul,
     44div.dashboard-widget-content ol,
     45div.dashboard-widget-content dl {
    3946    padding-left:0;
    4047    padding-right:15px;
    4148}
    42 #dashboard_secondary div.dashboard-widget-content ul li {
    43     float:right;
     49div#dashboard-widgets-wrap
     50{
     51    margin-right:0;
     52    margin-left:-10px;
    4453}
    45 #dashboard_secondary div.dashboard-widget-content ul li .post {
    46     font-family:arial;
     54
     55div.dashboard-widget {
     56    margin-right:0;
     57    margin-left:20px;
    4758}
    48 #dashboard_secondary div.dashboard-widget-content ul li a {
    49     border-right:0 none;
    50     border-left: 1px solid #dadada;
    51     height:110px;
    52 }
    53 #dashboard_secondary div.dashboard-widget-content ul li a cite {
    54     font-family: Tahoma;
    55 }
     59
    5660#dashboard-widgets .widget_rss ul li span.rss-date {
    5761    float:right;
    5862}
    5963#dashboard-widgets .widget_rss ul li a {
     64    float:right;
     65    margin:0 0 0.2em 0.5em;
     66}
     67#dashboard_secondary div.dashboard-widget-content ul li {
    6068    float: right;
    61     margin: 0 0 .2em .5em;
    6269}
     70#dashboard_secondary div.dashboard-widget-content ul li .post {
     71    font-family: sans-serif !important;
     72}
     73#dashboard_secondary div.dashboard-widget-content ul li a {
     74    border-right:0 none;
     75    border-left:1px solid #DADADA;
     76}
     77#dashboard_secondary div.dashboard-widget-content ul li a cite {
     78    font-family: sans-serif;
     79}
  • tags/2.6/wp-admin/css/global-rtl.css

    r8652 r8652  
    1 body, td {
    2     font-family: Tahoma;
    3 }
    4 textarea, input, select {
    5     font-family: Tahoma;
    6 }
    7 h1, h2, h3 {
    8     font-family:arial;
    9 }
     1//* styles for use by people extending the WordPress interface */
     2body, td { font-family: sans-serif; }
     3
     4textarea, input, select { font-family: sans-serif; }
     5
     6.alignleft { float: right; }
     7.alignright { float: left; }
     8
     9.textleft { text-align: right; }
     10.textright { text-align: left; }
     11   
     12.wrap h2 { font-family: sans-serif; }
     13
    1014.widefat td {
    1115    padding: 7px 10px 9px 15px;
    1216}
     17
    1318.widefat th {
    1419    padding: 9px 10px 6px 15px;
    1520    text-align: right;
    1621}
     22
    1723.widefat th input {
    1824    margin: 0 8px 0 0;
    1925}
     26
    2027.widefat .check-column {
    2128    text-align: left;
    2229}
     30
    2331.wrap h2 {
    24     font-family:arial;
    2532    margin: 5px -4px 0 0;
    26     padding-right:0;
    27     padding-left: 280px;
     33    padding: 0 0 7px 280px;
    2834}
    29 .wrap h2.long-header {
    30     padding-left: 0;
    31 }
  • tags/2.6/wp-admin/css/ie-rtl.css

    r8652 r8652  
    1 #poststuff .postbox h3 {
    2     padding-left:0;
    3     padding-right: 23px;
     1/* footer */
     2body, td {
     3    font-family: Tahoma,Verdana,sans-serif;
    44}
    5 * html #poststuff .postarea, * html #poststuff #titlediv {
    6     margin-left:0;
    7     margin-right: 3%;
     5
     6.wrap {
     7    text-align: right;
    88}
    9 * html #poststuff h2 {
    10     margin-right: 0;
     9
     10.wrap h2 {
     11    margin: 5px 0 0 4px;
    1112}
     13
     14#footer {
     15    padding-left:50px;
     16}
     17#footer p {
     18    background:none;
     19    height:auto;
     20    padding: 5px 5px 0;
     21}
     22
    1223#bh {
    13     padding-right:0;
     24    padding-left: 15px;
     25    padding-right: 0px;
     26}
     27/* write post */
     28#poststuff .togbox {
     29    margin-right:-16px;
     30}
     31#poststuff h3 {
     32    padding-right:20px;
     33}
     34
     35p#widget-search, p#post-search {
    1436    padding-left: 15px;
    1537}
    16 div#dashboard-widgets {
    17     padding-right:0;
    18     padding-left: 1px;
     38
     39.widefat th {
     40    padding-bottom: 8px;
    1941}
    20 #tagchecklist span a {
    21     margin: 4px -9px 0 0;
    22 }
    23 #poststuff .togbox {
    24     margin-left:0;
    25     margin-right: -19px;
    26 }
    27 .widefat th input {
    28     margin: 0 5px 0 0;
    29 }
    30 /* ---------- add by navid */
    31 #dashmenu { /* fix top right bottom in admin */
    32     direction:ltr;
    33 }
    34 #sidemenu a { /* fix left admin buttom ex. plugins, options */
     42
     43/* template editor */
     44#template textarea {
    3545    float:left;
    3646}
    37 .wrap h2 {
    38     margin:5px 4px 0 0;
     47
     48/* Editor */
     49
     50.mceToolbar {
     51    direction: ltr;
     52    text-align: left;
    3953}
    40 #editor-toolbar {/* fix hover in media uploader icon */
    41     direction:ltr;
    42 }
    43 #TB_window { /* fix theme preview */
    44     left:2%;
    45 }
    46 /* fix widget page */
    47 form#widgets-filter {
    48     position:static;
    49 }
    50 #widget-search {
    51     display:none;
    52 }
    53 /* fix manage comment page */
    54 ul.view-switch li {
    55     float:left;
    56 }
    57 form#posts-filter {
    58     position:static;
    59 }
    60 #post-search {
    61     display:none;
    62 }
    63 #submenu {
    64     margin-right: 20px;
    65 }
    66 /* Fixes for media-upload window */
    67 /* Center media-upload panel on screen */
    68 #TB_window {
    69     width: 670px;
    70     position: absolute;
    71     top: 50%;
    72     left: 50%;
    73     margin-right: 335px !important; }
  • tags/2.6/wp-admin/css/install-rtl.css

    r8652 r8652  
    11body {
    2     font-family: Tahoma;
    3 }
    4 /* Half the page disapears on IE6 */
    5 * html body {
    6     width: 700px;
    7     position: absolute;
    8     left: 50%;
    9     margin-right: 350px;
     2    font-size: 11px;
     3    font-family: sans-serif !important;
    104}
    115ul, ol {
    126    padding: 5px 22px 5px 5px;
    137}
    14 .step, th {
    15     text-align:right;
     8.form-table th {
     9    text-align: right;
    1610}
    17 .submit input, .button, .button-secondary  {
    18     font-family: Tahoma;
    19     margin-right:0;
     11input {
     12    padding: 1px
    2013}
    21 .form-table th {
    22     text-align:right;
     14#logo {
     15    text-align: left;
     16}
     17#admin_email {
     18    direction: ltr;
     19    text-align: left;
     20}
     21.submit input, .button, .button-secondary {
     22    font-family: sans-serif !important;
    2323}
    2424h1 {
    25     font-family:arial;
    26     margin: 5px -4px 0 0;
     25    font-family: sans-serif;
    2726}
  • tags/2.6/wp-admin/css/login-rtl.css

    r8652 r8652  
    11body {
    2     font-family: Tahoma;
     2    font-family: sans-serif;
     3    direction: rtl;
     4}
     5#login form .submit input {
     6    font-family: sans-serif !important;
    37}
    48form {
    59    margin-left:0;
    6     margin-right: 8px;
     10    margin-right:8px;
    711}
    812form .forgetmenot {
    913    float:right;
    1014}
    11 #login form .submit input  {
    12     font-family: Tahoma;
    13 }
    1415form .submit {
    1516    float:left;
    1617}
    17 #backtoblog a {
    18     left:auto;
    19     right:15px;
    20 }
    2118#login_error, .message {
    22     margin: 0 8px 16px 0;
     19    margin:0 8px 16px 0;
    2320}
    2421#nav {
    25     margin:0 8px 0 0;
     22    margin: 0 8px 0 0;
    2623}
    2724#user_pass, #user_login, #user_email {
    2825    margin-right:0;
    2926    margin-left: 6px;
     27    direction:ltr;
    3028}
    3129h1 a {
    3230    text-decoration:none;
    3331}
    34 /* ltr input */
    35 #user_login, #user_pass {
    36     direction:ltr;
     32#backtoblog a {
     33    left: auto;
     34    right: 15px;
    3735}
  • tags/2.6/wp-admin/css/media-rtl.css

    r8652 r8652  
    1 body#media-upload ul#sidemenu {
    2     left:auto;
    3     right:0;
    4     width: 620px;
    5 }
    6 #search-filter {
    7     text-align:left;
     1ul#sidemenu {
     2    left: auto;
     3    right: 0;
    84}
    95.align .field label {
    10     padding: 0 28px 0 0;
    11     margin: 0 0 0 1em;
     6    display: block;
     7    float: right;
     8    padding: 0 25px 0 0;
     9    margin: 5px 3px 5px 5px;
    1210}
    13 .image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
    14     background-position:center right;
     11.align .field input {
     12    display: block;
     13    float: right;
     14    margin: 5px 15px 5px 0;
    1515}
    16 tr.image-size label {
    17     margin: 0 0 0 1em;
     16.image-align-none-label,
     17.image-align-left-label,
     18.image-align-center-label,
     19.image-align-right-label {
     20    background-position: center right;
    1821}
    19 .filename.original {
    20     float: right;
    21 }
    22 .crunching {
    23     text-align: left;
    24     margin-right:0;
    25     margin-left: 5px;
    26 }
    27 button.dismiss {
    28     right:auto;
    29     left:5px;
    30 }
    31 .file-error {
    32     margin: 0 50px 5px 0;
    33 }
    34 .progress {
    35     left:auto;
    36     right:0;
    37 }
    38 .bar {
    39     border-right-width:0;
    40     border-left-width: 3px;
    41     border-left-style: solid;
    42 }
    43 .media-item .pinkynail {
    44     float:right;
    45 }
    46 .describe-toggle-on, .describe-toggle-off {
    47     float: left;
    48     margin-right:0;
    49     margin-left: 20px;
    50 }
    51 /* Specific to Uploader */
    52 
    53 #media-upload .media-upload-form p {
    54     margin: 0 0 1em 1em;
    55 }
    56 .filename {
    57     float: right;
    58     margin-left:0;
    59     margin-right: 10px;
    60 }
    61 #media-upload .describe th.label {
    62     text-align:right;
    63 }
    64 .menu_order {
    65     float:left;
    66 }
  • tags/2.6/wp-admin/css/press-this-ie-rtl.css

    r8652 r8652  
    1 .ui-tabs-nav {
    2     margin-right: 0;
    3 }
     1#menu { margin-right: 8px !important; }
     2
     3p.submit input { text-align: right !important; }
     4
     5li.ui-tabs-selected a { height: 25px; }
     6
     7#photo_directions span { right: 200px; left: auto; height: 8px; }
  • tags/2.6/wp-admin/css/press-this-rtl.css

    r8652 r8652  
    11body {
    2     font-family: Tahoma;
     2    font-family: sans-serif;
    33}
    4 .ui-tabs-nav {
    5     padding-left:0;
    6     padding-right:8px;
     4
     5#viewsite {
     6    right:auto; left: 8px;
    77}
    8 .ui-tabs-nav li {
    9     float: right;
     8
     9ul#menu {
     10    padding-right: 8px;
    1011}
    11 .button {
    12     font-family: Tahoma;
    13     margin-left:0;
    14     margin-right: 5px;
     12
     13.ui-tabs-nav li {
     14    float: right;
    1515}
    16 #wphead #viewsite {
    17     margin-left:0;
    18     margin-right: 10px;
     16
     17div#posting {
     18    padding-right:16px; padding-left: 0;
    1919}
    20 #viewsite {
    21     right:auto;
    22     left: 8px;
     20
     21div#categories {
     22    right: auto; left: 16px;
    2323}
    24 #wphead #viewsite a {
    25     font-family: Tahoma;
     24
     25div#categories h2 {
     26    margin:0.5em 1em 0.5em 0;
    2627}
    27 h1 {
    28     right:auto;
    29     left:0;
     28
     29#jaxtag {
     30    padding-right :1em; padding-left: 0;
    3031}
    31 div#posting {
    32     padding-left:0;
    33     padding-right: 16px;
     32
     33input#newtag {
     34    margin-left: 4px; width: 100px;
    3435}
    35 #photo_directions span {
    36     right:auto;
    37     left:3px;
     36
     37#photo_directions span {
     38    right: auto; left: 3px
    3839}
    39 #img_container a {
    40     float:right;
     40
     41#TB_ajaxContent #options {
     42    right: auto; left: 25px;
    4143}
    42 #img_container a, #img_container a:link, #img_container a:visited {
    43     margin:0 0 4px 4px;
     44
     45#TB_ajaxContent {
     46    text-align: right;
    4447}
    45 div#categories {
    46     right:auto;
    47     left:16px;
     48
     49#TB_ajaxContent #this_photo {
     50    direction: ltr;
    4851}
    49 div#categories h2 {
    50     margin: .5em 1em .5em 0;
     52
     53.video_split #extra_fields {
     54    float: right;
    5155}
    52 #tagsdiv #newtag {
    53     margin-right:0;
    54     margin-left: 5px;   
     56
     57.video_split .editor_area {
     58    float: left;
    5559}
    56 #jaxtag {
    57     padding-left:0;
    58     padding-right: 1em;
    59 }
    60 #tagchecklist {
    61     padding-left:0;
    62     padding-right: 1em;
    63 }
    64 #tagchecklist span {
    65     margin-right: 10px;
    66     margin-left: .5em;
    67     float: right;
    68 }
    69 #tagchecklist span a {
    70     margin: 6px -9px 0pt 0;
    71     float: right;
    72 }
    73 .submitbox {
    74     float: left;
    75 }
    76 .submitbox .submit input {
    77     text-align:right;
    78 }
    79 .video_split #extra_fields {
    80     float:right;
    81 }
    82 .video_split .editor_area {
    83     float: left;
    84 }
    85 .ac_results li {
    86     text-align:right;
    87 }
    88 #TB_ajaxContent #options {
    89     right:auto;
    90     left:25px;
    91 }
    92 #post_status {
    93     margin-left:0;
    94     margin-right: 10px;
    95 }
    96 #footer {
    97     padding: 10px 60px 0 0;
    98 }
  • tags/2.6/wp-admin/css/press-this.css

    r8652 r8652  
    55    padding: 0px;
    66}
    7 
    8 img { border: 0; }
    97/* Tabs */
    108@media projection , screen {
  • tags/2.6/wp-admin/css/theme-editor-rtl.css

    r8652 r8652  
    11#template textarea {
    2     font-family:monospace;
     2    font-family: monospace !important;
    33}
    44#templateside {
     
    77#themeselector {
    88    padding-right:0;
    9     padding-left: 5px;
    10     float: left;
     9    padding-left:5px;
    1110}
    1211div.tablenav {
     12    margin-left:210px;
    1313    margin-right:0;
    14     margin-left: 210px;
    1514}
  • tags/2.6/wp-admin/css/widgets-rtl.css

    r8652 r8652  
    1 /* 2 column liquid layout */
    21div.widget-liquid-left-holder {
    3     float: right;
    4     clear: right;
     2    clear:right;
     3    float:right;
    54    margin-right:0;
    6     margin-left: -310px;
     5    margin-left:-310px;
    76}
    87div.widget-liquid-left {
    98    margin-right:0;
    10     margin-left: 320px;
     9    margin-left:310px;
    1110}
    1211div.widget-liquid-right {
    13     float: left;
    14     clear: left;
     12    clear:left;
     13    float:left;
    1514}
    1615p#widget-search {
    17     right:auto;
    1816    left:0;
     17    right:auto
     18}
     19ul#widget-list li.widget-list-item h4.widget-title {
     20    float:right;
     21    text-align:right;
     22}
     23ul#widget-list li.widget-list-item div.widget-description {
     24    margin:0 200px 0 0;
     25    padding:0 4em 0 0;
     26}
     27.widget-control-save, .widget-control-remove {
     28    float:right;
     29    margin-right:0;
     30    margin-left:8px;
    1931}
    2032h4.widget-title span {
     
    2335h4.widget-title a {
    2436    float: left;
    25     margin-left:0;
    26     margin-right: 1em;
     37    margin: 0 1em 0 0;
    2738}
    28 ul#widget-list li.widget-list-item h4.widget-title {
    29     float:right;
     39li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited {
     40    right:auto;
     41    left:1em;
    3042}
    31 ul#widget-list li.widget-list-item div.widget-description {
    32     margin: 0 200px 0 0;
    33     padding: 0 4em 0 0;
     43
     44ul.widget-control-list div.widget-control-actions {
     45    margin-right:0;
     46    margin-left:-10px;
    3447}
    35 .widget-control-save, .widget-control-remove {
    36     margin-right:0;
    37     margin-left: 8px;
    38     float: right;
     48ul.widget-control-list h4.widget-title,
     49#dragHelper h4.widget-title {
     50    text-align: right;
    3951}
    40 li.widget-list-control-item h4.widget-title a,
    41 #dragHelper li.widget-list-control-item h4.widget-title a,
    42 #draghelper li.widget-list-control-item h4.widget-title a:visited {
    43     right:auto;
    44     left: 1em;
    45 }
  • tags/2.6/wp-admin/edit-comments.php

    r8652 r8652  
    3131    endforeach;
    3232    $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved;
    33     if ( isset($_REQUEST['apage']) )
    34         $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to );
    3533    if ( !empty($_REQUEST['mode']) )
    3634        $redirect_to = add_query_arg('mode', $_REQUEST['mode'], $redirect_to);
     
    178176<?php do_action('manage_comments_nav', $comment_status); ?>
    179177<?php wp_nonce_field('bulk-comments'); ?>
    180 <?php if ( isset($_GET['apage']) ) { ?>
    181     <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
    182 <?php } ?>
    183178</div>
    184179
  • tags/2.6/wp-admin/edit-form-advanced.php

    r8652 r8652  
    88$messages[3] = __('Custom field deleted.');
    99$messages[4] = __('Post updated.');
    10 
    11 if ( isset($_GET['revision']) )
    12     $messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
     10$messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( $_GET['revision'], false ) );
    1311
    1412$notice = false;
     
    7472<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
    7573<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
    76 <input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
     74<input name="referredby" type="hidden" id="referredby" value="<?php
     75if ( !empty($_REQUEST['popupurl']) )
     76    echo clean_url(stripslashes($_REQUEST['popupurl']));
     77else if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && $post_ID && url_to_postid(wp_get_referer()) === $post_ID  )
     78    echo 'redo';
     79else
     80    echo clean_url(stripslashes(wp_get_referer()));
     81?>" />
    7782<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
    7883
     
    111116
    112117<?php if ( current_user_can( 'publish_posts' ) ) : ?>
    113 <p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
     118<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex="4" /> <?php _e('Keep this post private') ?></label></p>
    114119<?php endif; ?>
    115120<?php
  • tags/2.6/wp-admin/edit-link-categories.php

    r8652 r8652  
    1111    foreach( (array) $_GET['delete'] as $cat_ID ) {
    1212        $cat_name = get_term_field('name', $cat_ID, 'link_category');
    13         $default_cat_id = get_option('default_link_category');
    14        
     13
    1514        // Don't delete the default cats.
    16         if ( $cat_ID == $default_cat_id )
     15        if ( $cat_ID == get_option('default_link_category') )
    1716            wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
    1817
    19         wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
     18        wp_delete_term($cat_ID, 'link_category');
    2019    }
    2120
  • tags/2.6/wp-admin/edit-page-form.php

    r8652 r8652  
    66$messages[3] = __('Custom field deleted.');
    77$messages[4] = __('Page updated.');
    8 
    9 if ( isset($_GET['revision']) )
    10     $messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) );
    118
    129$notice = false;
     
    3128$user_ID = (int) $user_ID;
    3229
     30$sendto = clean_url(stripslashes(wp_get_referer()));
     31
     32if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
     33    $sendto = 'redo';
    3334?>
    3435
     
    5758<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
    5859<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
    59 <input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
     60<input name="referredby" type="hidden" id="referredby" value="<?php
     61if ( strpos( wp_get_referer(), '/wp-admin/' ) === false && $post_ID && url_to_postid(wp_get_referer()) === $post_ID )
     62    echo 'redo';
     63else
     64    echo clean_url(stripslashes(wp_get_referer()));
     65?>" />
    6066<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
    6167
     
    9096</p>
    9197<?php if ( current_user_can( 'publish_posts' ) ) : ?>
    92 <p id="private-checkbox"><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
     98<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
    9399<?php endif; ?>
    94100
  • tags/2.6/wp-admin/edit-pages.php

    r8652 r8652  
    123123if ( empty($pagenum) )
    124124    $pagenum = 1;
    125 if( !$per_page || $per_page < 0 )
     125if( !$per_page || $pre_page < 0 )
    126126    $per_page = 20;
    127127
  • tags/2.6/wp-admin/gears-manifest.php

    r8652 r8652  
    6565{
    6666"betaManifestVersion" : 1,
    67 "version" : "<?php echo $man_version; ?>_20080810",
     67"version" : "<?php echo $man_version; ?>_20080710a",
    6868"entries" : [
    6969<?php echo $defaults; ?>
     
    104104{ "url" : "images/yes.png" },
    105105
    106 <?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?>
     106{ "url" : "../wp-includes/images/crystal/archive.png" },
     107{ "url" : "../wp-includes/images/crystal/audio.png" },
     108{ "url" : "../wp-includes/images/crystal/code.png" },
     109{ "url" : "../wp-includes/images/crystal/default.png" },
     110{ "url" : "../wp-includes/images/crystal/document.png" },
     111{ "url" : "../wp-includes/images/crystal/interactive.png" },
     112{ "url" : "../wp-includes/images/crystal/text.png" },
     113{ "url" : "../wp-includes/images/crystal/video.png" },
     114{ "url" : "../wp-includes/images/crystal/spreadsheet.png" },
     115{ "url" : "../wp-includes/images/rss.png" },
     116{ "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
     117{ "url" : "../wp-includes/js/thickbox/tb-close.png" },
     118{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
     119
    107120{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" },
    108121{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" },
     
    119132{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
    120133{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
    121 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
     134{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311d" },
    122135{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
    123136{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
     
    136149{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
    137150{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
    138 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
     151{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311d" },
    139152{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
    140153
     
    149162{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
    150163{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
    151 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
     164{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311d" },
    152165{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
    153166{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },
     
    191204{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" },
    192205{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" },
    193 { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" },
    194 <?php } ?>
    195 
    196 { "url" : "../wp-includes/images/crystal/archive.png" },
    197 { "url" : "../wp-includes/images/crystal/audio.png" },
    198 { "url" : "../wp-includes/images/crystal/code.png" },
    199 { "url" : "../wp-includes/images/crystal/default.png" },
    200 { "url" : "../wp-includes/images/crystal/document.png" },
    201 { "url" : "../wp-includes/images/crystal/interactive.png" },
    202 { "url" : "../wp-includes/images/crystal/text.png" },
    203 { "url" : "../wp-includes/images/crystal/video.png" },
    204 { "url" : "../wp-includes/images/crystal/spreadsheet.png" },
    205 { "url" : "../wp-includes/images/rss.png" },
    206 { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" },
    207 { "url" : "../wp-includes/js/thickbox/tb-close.png" },
    208 { "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }
     206{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }
    209207]}
  • tags/2.6/wp-admin/includes/media.php

    r8652 r8652  
    6868function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
    6969
    70     if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
     70    // CAPTIONS_OFF is temporary. Do not use it.
     71    if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html;
    7172    $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
    7273
     
    103104
    104105    if ( isset($file['error']) )
    105         return new WP_Error( 'upload_error', $file['error'] );
     106        return new wp_error( 'upload_error', $file['error'] );
    106107
    107108    $url = $file['url'];
     
    143144
    144145    if ( isset($file['error']) )
    145         return new WP_Error( 'upload_error', $file['error'] );
     146        return new wp_error( 'upload_error', $file['error'] );
    146147
    147148    $url = $file['url'];
     
    281282        $keys = array_keys($_POST['send']);
    282283        $send_id = (int) array_shift($keys);
    283         $attachment = stripslashes_deep( $_POST['attachments'][$send_id] );
     284        $attachment = $_POST['attachments'][$send_id];
    284285        $html = $attachment['post_title'];
    285286        if ( !empty($attachment['url']) ) {
     
    510511        $form_fields['post_title']['required'] = true;
    511512
    512         $form_fields['post_excerpt']['label'] = __('Caption');
    513         $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
     513        // CAPTIONS_OFF is temporary. Do not use it.
     514        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
     515            $form_fields['post_excerpt']['label'] = __('Alternate Text');
     516            $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"');
     517        } else {
     518            $form_fields['post_excerpt']['label'] = __('Caption');
     519            $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
     520        }
    514521
    515522        $form_fields['post_content']['label'] = __('Description');
     
    600607    $link = get_attachment_link($post->ID);
    601608
     609    // CAPTIONS_OFF is temporary. Do not use it.
     610    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
     611        $alt = __('Alternate Text');
     612    else
     613        $alt = __('Caption');
     614
    602615    $form_fields = array(
    603616        'post_title'   => array(
     
    606619        ),
    607620        'post_excerpt' => array(
    608             'label'      => __('Caption'),
     621            'label'      => $alt,
    609622            'value'      => $edit_post->post_excerpt,
    610623        ),
     
    872885
    873886?>
     887<input type='hidden' name='post_id' value='<?php echo (int) $post_id; ?>' />
    874888<div id="media-upload-notice">
    875889<?php if (isset($errors['upload_notice']) ) { ?>
     
    934948<?php do_action('pre-html-upload-ui'); ?>
    935949    <p>
    936     <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onclick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
     950    <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php echo attribute_escape(__('Upload')); ?>" /> <a href="#" onClick="return top.tb_remove();"><?php _e('Cancel'); ?></a>
    937951    </p>
     952    <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
    938953    <br class="clear" />
    939954    <?php if ( is_lighttpd_before_150() ): ?>
     
    10071022        if ( f.alt.value ) {
    10081023            alt = f.alt.value.replace(/['"<>]+/g, '');
    1009 <?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
     1024<?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?>
    10101025            caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
    10111026<?php } ?>
     
    10681083</div>
    10691084<input type="submit" class="button savebutton" name="save" value="<?php echo attribute_escape( __( 'Save all changes' ) ); ?>" />
    1070 </form>
    10711085<?php
    10721086    endif;
     
    12651279
    12661280function type_form_image() {
    1267 
    1268     if ( apply_filters( 'disable_captions', '' ) ) {
    1269         $alt = __('Alternate Text');
    1270         $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"');
    1271     } else {
    1272         $alt = __('Image Caption');
    1273         $alt_help = __('Also used as alternate text for the image');
    1274     }
    1275 
    1276     return '
     1281    $form = '
    12771282    <table class="describe"><tbody>
    12781283        <tr>
     
    12811286                <span class="alignright"><img id="status_img" src="images/required.gif" title="required" alt="required" /></span>
    12821287            </th>
    1283             <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
     1288            <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()"></td>
    12841289        </tr>
    12851290
     
    12911296            <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
    12921297        </tr>
    1293 
     1298';
     1299    // CAPTIONS_OFF is temporary. Do not use it.
     1300    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
     1301        $form .= '
    12941302        <tr>
    12951303            <th valign="top" scope="row" class="label">
    1296                 <span class="alignleft"><label for="alt">' . $alt . '</label></span>
     1304                <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
    12971305            </th>
    12981306            <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
    1299             <p class="help">' . $alt_help . '</p></td>
    1300         </tr>
    1301 
     1307            <p class="help">' . __('Alt text for the image, e.g. "The Mona Lisa"') . '</p></td>
     1308        </tr>
     1309';
     1310
     1311    } else {
     1312        $form .= '
     1313        <tr>
     1314            <th valign="top" scope="row" class="label">
     1315                <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span>
     1316            </th>
     1317            <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
     1318            <p class="help">' . __('Also used as alternate text for the image') . '</p></td>
     1319        </tr>
     1320';
     1321    }
     1322        $form .= '
    13021323        <tr class="align">
    13031324            <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
     
    13341355';
    13351356
     1357    return $form;
    13361358}
    13371359
  • tags/2.6/wp-admin/includes/plugin.php

    r8652 r8652  
    3535   
    3636    if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
    37         $cache_plugins = array();
     37        $cached_plugins = array();
    3838   
    3939    if ( isset($cache_plugins[ $plugin_folder ]) )
     
    240240    }
    241241
    242     //Invalid is any plugin that is deactivated due to error.
    243     $invalid = array();
    244 
    245242    // If a plugin file does not exist, remove it from the list of active
    246243    // plugins.
     
    248245        $result = validate_plugin($check_plugin);
    249246        if ( is_wp_error( $result ) ) {
    250             $invalid[$check_plugin] = $result;
    251247            deactivate_plugins( $check_plugin, true);
    252248        }
    253249    }
    254     return $invalid;
    255250}
    256251
  • tags/2.6/wp-admin/includes/post.php

    r8652 r8652  
    604604    $post->post_date = $original_date;
    605605    $post->post_name = $original_name;
     606    $post->post_title = $original_title;
    606607    return $permalink;
    607608}
  • tags/2.6/wp-admin/includes/schema.php

    r8652 r8652  
    1616$wp_queries="CREATE TABLE $wpdb->terms (
    1717 term_id bigint(20) NOT NULL auto_increment,
    18  name varchar(200) NOT NULL default '',
     18 name varchar(55) NOT NULL default '',
    1919 slug varchar(200) NOT NULL default '',
    2020 term_group bigint(10) NOT NULL default 0,
    2121 PRIMARY KEY  (term_id),
    22  UNIQUE KEY slug (slug),
    23  KEY name (name)
     22 UNIQUE KEY slug (slug)
    2423) $charset_collate;
    2524CREATE TABLE $wpdb->term_taxonomy (
  • tags/2.6/wp-admin/includes/taxonomy.php

    r8652 r8652  
    134134    foreach ( $tags as $tag )
    135135        $tag_names[] = $tag->name;
    136     $tags_to_edit = join( ',', $tag_names );
     136    $tags_to_edit = join( ', ', $tag_names );
    137137    $tags_to_edit = attribute_escape( $tags_to_edit );
    138138    $tags_to_edit = apply_filters( 'tags_to_edit', $tags_to_edit );
  • tags/2.6/wp-admin/includes/template.php

    r8652 r8652  
    671671        $edit = $user_object->user_login;
    672672    }
    673     $role_name = $wp_roles->role_names[$role] ? translate_with_context($wp_roles->role_names[$role]) : __('None');
     673    $role_name = translate_with_context($wp_roles->role_names[$role]);
    674674    $r = "<tr id='user-$user_object->ID'$style>
    675675        <th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th>
  • tags/2.6/wp-admin/includes/upgrade.php

    r8652 r8652  
    544544    foreach ($categories as $category) {
    545545        $term_id = (int) $category->cat_ID;
    546         $name = $category->cat_name;
    547         $description = $category->category_description;
    548         $slug = $category->category_nicename;
    549         $parent = $category->category_parent;
    550546        $term_group = 0;
    551547
  • tags/2.6/wp-admin/includes/user.php

    r8652 r8652  
    260260        $reassign = (int) $reassign;
    261261        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $id) );
    262         $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $id) );
     262        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d}", $reassign, $id) );
    263263    }
    264264
  • tags/2.6/wp-admin/install-helper.php

    r8652 r8652  
    1010 **           false on error
    1111 */
    12 if ( ! function_exists('maybe_create_table') ) :
    1312function maybe_create_table($table_name, $create_ddl) {
    1413    global $wpdb;
     
    2827    return false;
    2928}
    30 endif;
    3129
    3230/**
     
    3634 **           false on error
    3735 */
    38 if ( ! function_exists('maybe_add_column') ) :
    3936function maybe_add_column($table_name, $column_name, $create_ddl) {
    4037    global $wpdb, $debug;
     
    5552    return false;
    5653}
    57 endif;
     54
    5855
    5956/**
  • tags/2.6/wp-admin/js/forms.js

    r8652 r8652  
    11function checkAll(jQ) { // use attr( checked, fn )
    2     jQuery(jQ).find( 'tbody:visible :checkbox' ).attr( 'checked', function() {
     2    jQuery(jQ).find( 'tbody :checkbox' ).attr( 'checked', function() {
    33        return jQuery(this).attr( 'checked' ) ? '' : 'checked';
    44    } );
  • tags/2.6/wp-admin/js/wp-gears.js

    r8652 r8652  
    2626
    2727    storeName : function() {
    28         var name = window.location.protocol + window.location.host;
     28      var name = window.location.protocol + window.location.host;
    2929
    30         name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
    31         name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
     30      name = name.replace(/[\/\\:*"?<>|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name
     31      name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars
    3232
    33         return name;
    34     },
     33      return name;
     34    },
    3535
    36     message : function(show) {
     36    message : function(show) {
    3737        var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), num = t.I('gears-upd-number'), wait = t.I('gears-wait');
    3838
     
    6262        return document.getElementById(id);
    6363    }
    64 };
     64}
    6565
    66 (function() {
     66function gearsInit() {
    6767    if ( 'undefined' != typeof google && google.gears ) return;
    6868
    6969    var gf = false;
    70     if ( 'undefined' != typeof GearsFactory ) {
     70    if ( 'undefined' != typeof GearsFactory ) { // Firefox
    7171        gf = new GearsFactory();
    72     } else {
     72    } else { // IE
    7373        try {
    7474            gf = new ActiveXObject('Gears.Factory');
    75             if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 )
    76                 gf.privateSetGlobalObject(this);
    77         } catch (e) {
    78             if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
    79                 gf = document.createElement("object");
    80                 gf.style.display = "none";
    81                 gf.width = 0;
    82                 gf.height = 0;
    83                 gf.type = "application/x-googlegears";
    84                 document.documentElement.appendChild(gf);
    85             }
    86         }
     75        } catch (e) {}
    8776    }
    8877
     
    9079    if ( 'undefined' == typeof google ) google = {};
    9180    if ( ! google.gears ) google.gears = { factory : gf };
    92 })();
     81}
     82
     83gearsInit();
  • tags/2.6/wp-admin/link-category.php

    r8652 r8652  
    2929
    3030    $cat_name = get_term_field('name', $cat_ID, 'link_category');
    31     $default_cat_id = get_option('default_link_category');
    3231
    3332    // Don't delete the default cats.
    34     if ( $cat_ID == $default_cat_id )
     33    if ( $cat_ID == get_option('default_link_category') )
    3534        wp_die(sprintf(__("Can&#8217;t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
    3635
    37     wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id));
     36    wp_delete_term($cat_ID, 'link_category');
    3837
    3938    $location = 'edit-link-categories.php';
     
    7574    }
    7675
    77     $update =  wp_update_term($cat_ID, 'link_category', $_POST);
    78 
    79     if ( $update && !is_wp_error($update) )
     76    if ( wp_update_term($cat_ID, 'link_category', $_POST) )
    8077        $location = add_query_arg('message', 3, $location);
    8178    else
  • tags/2.6/wp-admin/options-permalink.php

    r8652 r8652  
    164164<h3><?php _e('Optional'); ?></h3>
    165165<?php if ($is_apache) : ?>
    166     <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
     166    <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
    167167<?php else : ?>
    168     <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
     168    <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>/topics/</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>
    169169<?php endif; ?>
    170170
  • tags/2.6/wp-admin/page.php

    r8652 r8652  
    3535        $location = $_POST['referredby'];
    3636        $location = remove_query_arg('_wp_original_http_referer', $location);
    37         if ( false !== strpos($location, 'edit-pages.php') )
     37        if ( $_POST['referredby'] == 'redo' )
     38            $location = get_permalink( $page_ID );
     39        elseif ( false !== strpos($location, 'edit-pages.php') )
    3840            $location = add_query_arg('posted', $page_ID, $location);
    3941        elseif ( false !== strpos($location, 'wp-admin') )
  • tags/2.6/wp-admin/plugins.php

    r8652 r8652  
    166166require_once('admin-header.php');
    167167
    168 $invalid = validate_active_plugins();
    169 if( !empty($invalid) )
    170     foreach($invalid as $plugin_file => $error)
    171         echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), wp_specialchars($plugin_file), $error->get_error_message()) . '</p></div>';
     168validate_active_plugins();
     169
    172170?>
    173171
  • tags/2.6/wp-admin/post.php

    r8652 r8652  
    3737        $location = $_POST['referredby'];
    3838        $location = remove_query_arg('_wp_original_http_referer', $location);
    39         if ( false !== strpos($location, 'edit.php') )
     39        if ( $_POST['referredby'] == 'redo' )
     40            $location = get_permalink( $post_ID );
     41        elseif ( false !== strpos($location, 'edit.php') )
    4042            $location = add_query_arg('posted', $post_ID, $location);       
    4143        elseif ( false !== strpos($location, 'wp-admin') )
  • tags/2.6/wp-admin/press-this.php

    r8652 r8652  
    3535
    3636            foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
    37                
     37                // escape quote for matching
     38                $quoted = preg_quote2($image);
     39
    3840                // see if files exist in content - we don't want to upload non-used selected files.
    39                 if( strpos($_REQUEST['content'], $image) !== false ) {
     41                if( strpos($_REQUEST['content'], $quoted) !== false ) {
    4042                    $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
    41                      
    4243                    // Replace the POSTED content <img> with correct uploaded ones.
    43                     // escape quote for matching
    44                     $quoted = preg_quote2($image);
    4544                    if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content);
    4645                }
     
    185184        $host = parse_url($uri);
    186185
    187         $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is';
     186        $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif)[^<>\'\"]*)(\2)([^>\/]*)\/*>/is';
    188187        preg_match_all($pattern, $content, $matches);
    189        
     188
    190189        if ( empty($matches[1]) ) return '';
    191190
    192191        $sources = array();
    193192        foreach ($matches[3] as $src) {
    194             // if no http in url
    195193            if(strpos($src, 'http') === false)
    196                 // if it doesn't have a relative uri
    197                 if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === true)
     194                if(strpos($src, '../') === false && strpos($src, './') === false)
    198195                    $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
    199196                else
    200                     $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
    201            
     197                    $src = 'http://'.str_replace('//','/', $host['host'].'/'.$host['path'].'/'.$src);
     198
    202199            $sources[] = clean_url($src);
    203200        }
     
    250247
    251248    function pick(img, desc) {
    252         if (img) {
    253             if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length;
     249        if (img) { 
     250            length = jQuery('.photolist input').length;
    254251            if(length == 0) length = 1;
    255252            jQuery('.photolist').append('<input name="photo_src[' + length + ']" value="' + img +'" type="hidden"/>');
    256253            jQuery('.photolist').append('<input name="photo_description[' + length + ']" value="' + desc +'" type="hidden"/>');
    257             append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" class="aligncenter"/></p>');
     254            append_editor("\n\n" + '<p><img src="' + img +'" alt="' + desc + '" /></p>');
    258255        }
    259256        tinyMCE.activeEditor.resizeToContent();
     
    270267
    271268    jQuery(document).ready(function() {
    272         jQuery('#extra_fields').html('<div class="photolist"></div><small id="photo_directions"><?php _e("Click images to select:") ?> <span><a href="#" id="photo_add_url" class="thickbox"><?php _e("Add from URL") ?> +</a></span></small><div class="titlewrap"><div id="img_container"></div></div>');
    273269        jQuery('#img_container').html(strtoappend);
    274270        jQuery('#photo_add_url').attr('href', '?ajax=thickbox_url&height=200&width=500');
     
    280276
    281277if($_REQUEST['ajax'] == 'photo') { ?>
    282 
     278        <div class="photolist"></div>
     279
     280        <small id="photo_directions"><?php _e('Click images to select:') ?> <span><a href="#" id="photo_add_url" class="thickbox"><?php _e('Add from URL') ?> +</a></span></small>
     281
     282        <div class="titlewrap">
     283            <div id="img_container"></div>
     284        </div>
    283285<?php die;
    284286}
     
    321323                language : "<?php echo $language; ?>",
    322324                width: "100%",
    323                 height: "300",
    324325                theme : "advanced",
    325326                theme_advanced_buttons1 : "bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink",
     
    445446                jQuery('#extra_fields').show();
    446447                jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>');
     448                jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>');
    447449                jQuery.ajax({
    448450                    type: "GET",
     
    471473        <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
    472474            show('video');
    473         <?php  } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
     475            <?php  } elseif ( preg_match("/flickr\.com/i", $url) ) { ?>
    474476            show('photo');
    475477        <?php } ?>
     
    504506            <h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
    505507            <div class="editor-container">
    506                 <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</textarea>
     508                <textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } ?><a href="<?php echo $url ?>"><?php echo $title; ?></a>.</textarea>
    507509            </div>
    508510        </div>
  • tags/2.6/wp-admin/revision.php

    r8652 r8652  
    134134    $title = __( 'Post Revisions' );
    135135}
     136
     137// Converts post_author ID# into name
     138add_filter( '_wp_post_revision_field_post_author', 'get_author_name' );
    136139
    137140require_once( 'admin-header.php' );
  • tags/2.6/wp-admin/rtl.css

    r8652 r8652  
    1 a:link, a:visited {
    2     text-decoration:none;
    3 }
    4 a:hover {
    5     text-decoration:underline;
    6 }
    7 .plugins .togl {
    8     border-right-width: 0;
    9     border-left-width: 1px;
    10     border-left-style: solid;
    11 }
    12 form#upload th {
    13     text-align:left;
    14 }
    15 td.available-theme {
    16     text-align:right;
    17 }
    18 #current-theme img {
    19     float: right;
     1html,#edit-slug-box,#trackback,#category_nicename,#slug,#dbuser,#dbpass,#dbname,#dbhost,#dbprefix,#dccharset,input[name=gmpath],input[name=archivespath],input[name=lastentry],input[name=email],input[name=url],input[name=aim],input[name=yim],input[name=jabber],#newcontent,#email,#newcomment_author_url,#pass1,#pass2,#siteurl,#home,#admin_email,#date_format,#time_format,#mailserver_url,#mailserver_login,#mailserver_pass,#ping_sites,#blog_charset,#moderation_keys,#blacklist_keys,#permalink_structure,#category_base,#tag_base,#upload_path,#upload_url_path,#insertonly[src],#insertonly[href],#mailserver_port,#thumbnail_size_w,#thumbnail_size_h,#medium_size_w,#medium_size_h,#posts_per_page,#posts_per_rss,#comment_max_links,#insertonly[src],#link_url,#link_image,#rss_uri,#user_login,#key
     2{
     3    direction:ltr;
     4    text-align:left
     5}
     6
     7body, td, .submit input, .button, .button-secondary, .button-highlighted, #your-profile legend, .quicktags, .search, #wpcontent select, #wphead #viewsite a, #wphead h1 {
     8    font-family: sans-serif !important;
     9}
     10
     11.code, #quicktags #ed_code {
     12    font-family: monospace !important;
     13}
     14
     15#wpwrap,#footer,#TB_title,.media-upload-form,#media-upload-header
     16{
     17    direction:rtl!important;
     18    text-align:right!important
     19}
     20
     21#user_info
     22{
     23    left:15px;
     24    right:auto
     25}
     26
     27#wphead h1
     28{
     29    margin:0 0 0 15%;
     30    padding:11px 15px 16px 170px
     31}
     32
     33#wphead #viewsite
     34{
     35    margin-left:0;
     36    margin-right:10px
     37}
     38
     39#sidemenu
     40{
     41    float:left;
     42    margin:-30px 315px 0 15px;
     43    padding-left:0;
     44    padding-right:10px
     45}
     46
     47#dashmenu
     48{
     49    font-size:11px;
     50    left:auto;
     51    padding-left:0;
     52    padding-right:9px;
     53    right:0
     54}
     55
     56#dashmenu a
     57{
     58    margin-left:8px;
     59    margin-right:8px;
     60}
     61
     62#adminmenu
     63{
     64    height:32px;
     65    padding:5px 8px 0 0
     66}
     67
     68#adminmenu li a
     69{
     70    display:block;
     71    float:right;
     72    font:700 16px/100% sans-serif;
     73    margin:0 0 0 10px;
     74    padding:5px 7px 9px
     75}
     76
     77#adminmenu li a.current
     78{
     79    font-weight:700
     80}
     81
     82#adminmenu li a #awaiting-mod
     83{
     84    background:url(images/comment-stalk-rtl.gif) -309px bottom !important;
     85    font-family: sans-serif !important;
     86    margin-left:-45px;
     87    margin-right:.2em;
     88    margin-top:-5px
     89}
     90
     91#adminmenu li a:hover #awaiting-mod
     92{
     93    background-position: -229px bottom !important;
     94}
     95
     96#adminmenu li a #awaiting-mod span
     97{
     98    left:0;
     99    right:auto
     100}
     101
     102#submenu li a
     103{
     104    display:block;
     105    float:right;
     106    margin:0 10px 10px 0;
     107    padding:2px 4px
     108}
     109
     110p#post-search
     111{
     112    left:0;
     113    right:auto
     114}
     115
     116.tablenav div
     117{
     118    float:right!important
     119}
     120
     121.tablenav .delete
     122{
     123    margin-left: 40px;
     124    margin-right: 0;
     125}
     126
     127ul.view-switch
     128{
     129    float:left;
     130    margin:-28px 0 -2px 5px
     131}
     132
     133#currenttheme img
     134{
     135    float:right;
     136    margin-left:1em;
     137    margin-right:0
     138}
     139
     140form#themeselector
     141{
     142    float:left
     143}
     144
     145.form-table input.tog
     146{
     147    float:right;
    20148    margin-right:0;
    21     margin-left: 1em;
    22 }
    23 .quicktags, .search {
    24     font-family: Tahoma;
    25 }
    26 /* 201 - 403
    27 =================================== */
    28 .side-info ul {
     149    margin-left:2px;
     150}
     151
     152.curtime
     153{
     154    background-position:right 2px;
    29155    padding-left:0;
    30156    padding-right:18px;
    31157}
    32 .submit input, .button, .button-secondary, .button-highlighted {
    33     font-family: Tahoma;
    34 }
    35 #wpcontent select  {
    36     font-family: Tahoma;
    37 }
    38 /* #postdiv, #titlediv, #guiddiv, #poststuff .stuffbox {
    39     margin:0 0 0 8px;
    40 } */
    41 #quicktags #ed_code {
    42     font-family: Tahoma;
    43 }
    44 #searchform fieldset {
    45     float:right;
    46     margin: 0 0 1em 1.5ex;
    47 }
    48 #searchform fieldset legend {
    49     padding: 0 1px .2em 0;
    50 }
    51 #searchform #post-query-submit {
    52     float:right;
    53 }
    54 /* 404 - 804
    55 =================================== */
    56 #template div {
     158
     159#poststuff #edButtonPreview,#poststuff #edButtonHTML
     160{
     161    float:left;
     162    margin-left:8px;
     163    margin-right:0
     164}
     165
     166#poststuff #media-buttons
     167{
     168    direction: rtl;
     169    float:left;
     170    margin-left:20px;
     171    margin-right:0
     172}
     173
     174#poststuff #media-buttons a
     175{
     176    margin-left:8px;
    57177    margin-right:0;
    58     margin-left: 190px;
    59 }
    60 * html #template div {
    61     margin-left: 0;
    62 }
    63 #your-profile legend {
    64     font-family:arial;
    65 }
    66 #ajax-response.alignleft {
     178    padding: 0 5px 2px 2px;
     179}
     180
     181#poststuff .togbox
     182{
    67183    margin-left:0;
    68     margin-right: 2em;
    69 }
    70 .page-numbers {
    71     margin-right:0;
    72     margin-left:3px;
    73 }
    74 .comment-column {
    75     margin-left:0;
    76     margin-right: 5px;
    77 }
    78 .tablenav a.button-secondary {
    79     margin: 1px 0 0 8px;
    80 }
    81 #update-nag, .plugin-update {
    82     clear:both;
    83 }
    84 /* .tablenav .tablenav-pages {
    85     float:left;
    86 } */
    87 #user_info {
    88     right:auto;
    89     left:15px;
    90 }
    91 #wphead #viewsite {
    92     margin-left:0;
    93     margin-right:10px;
    94 }
    95 #wphead #viewsite a {
    96     font-family: Tahoma;
    97 }
    98 #wphead h1 {
    99     font-family:arial;
    100     margin-right:0;
    101     margin-left:15%;
    102     padding: 11px 12px 16px 170px;
    103 }
    104 #dashmenu {
    105     right:0;
    106     left:auto;
    107     padding-left:0;
    108     padding-right: 9px;
    109 }
    110 #dashmenu a {
    111     margin-right:0;
    112     margin-left:8px;
    113 }
    114 #adminmenu {
    115     padding-left:0;
    116     padding-right:11px;
    117 }
    118 #adminmenu a {
    119     font-family:arial;
    120     font-weight:bold;
    121     padding:6px 7px;
    122 }
    123 #adminmenu a.current, #sidemenu a.current {
    124     font-weight:bold;
    125 }
    126 #sidemenu {
    127     margin: -30px 0 0 15px;
    128     float: left;
    129     padding-left:0;
    130     padding-right: 10px;
    131     height: 1%; /* Peek-a-boo in IE6 */
    132 }
    133 #sidemenu a {
    134     float:right;
    135 }
    136 #submenu li {
    137     padding: 0 17px 8px 0;
    138     font-size:13px;
    139 }
    140 #adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span {
    141     right:auto;
    142     left:0;
    143 }
    144 #adminmenu li a:hover #awaiting-mod, #sidemenu li a:hover #update-plugins {
    145     background-position: -160px top;
    146 }
    147 /* 804 - 1004
    148 =================================== */
    149 #footer {
    150     padding: 10px 60px 0 0;
    151 }
    152 .form-table th {
    153     text-align:right;
    154 }
    155 .form-table input.tog {
    156     margin-right:0;
    157     margin-left: 2px;
    158     float: right;
    159 }
    160 .form-table table.color-palette {
    161     float:right;
    162 }
    163 #pass-strength-result {
    164     float:right;
    165     margin-right:0;
    166     margin-left: 5px;
    167 }
    168 #profile-page .form-table #rich_editing {
    169     margin-right:0;
    170     margin-left: 5px;
    171 }
    172 #tagsdiv #newtag {
    173     margin-right:0;
    174     margin-left: 5px;
    175 }
    176 #tagchecklist {
    177     margin-left:0;
    178     margin-right: 10px;
    179 }
    180 #tagchecklist strong {
    181     margin-left:0;
    182     margin-right: -8px;
    183 }
    184 #tagchecklist span {
    185     margin-right:0;
    186     margin-left: 25px;
    187     float: right;
    188 }
     184    margin-right:-19px
     185}
     186
     187#categorydiv ul#category-tabs,#linkcategorydiv ul#category-tabs
     188{
     189    float:right;
     190    margin:0 0 0 -120px;
     191    text-align:left
     192}
     193
     194ul#category-tabs li.ui-tabs-selected,#poststuff .togbox
     195{
     196    -khtml-border-bottom-left-radius:0;
     197    -khtml-border-bottom-right-radius:3px;
     198    -khtml-border-top-left-radius:0;
     199    -khtml-border-top-right-radius:3px;
     200    -moz-border-radius-bottomleft:0;
     201    -moz-border-radius-bottomright:3px;
     202    -moz-border-radius-topleft:0;
     203    -moz-border-radius-topright:3px;
     204    -webkit-border-bottom-left-radius:0;
     205    -webkit-border-bottom-right-radius:3px;
     206    -webkit-border-top-left-radius:0;
     207    -webkit-border-top-right-radius:3px;
     208    border-bottom-left-radius:0;
     209    border-bottom-right-radius:3px;
     210    border-top-left-radius:0;
     211    border-top-right-radius:3px
     212}
     213
     214div.ui-tabs-panel
     215{
     216    margin:0 120px 0 0
     217}
     218
     219#tagchecklist span
     220{
     221    float:right;
     222    margin-left:25px;
     223    margin-right:0
     224}
     225
    189226#tagchecklist span a {
    190227    margin: 6px -9px 0 0;
    191228    float: right;
    192229}
    193 /* 1005 - 1304
    194 =================================== */
    195 .ac_results li {
    196     text-align:right;
    197 }
    198 #poststuff h2 {
    199     clear:right;
    200 }
    201 #poststuff .postbox, #poststuff .stuffbox, #titlediv, #poststuff .postarea {
    202     margin-left: 8px;
    203     margin-right: 20px;
    204 }
    205 #edit-slug-buttons a.save {
     230
     231
     232.tablenav .tablenav-pages
     233{
     234    float:left !important;
     235    width:200px
     236}
     237
     238.tablenav-pages .page-numbers
     239{
     240    display:block;
     241    float:right
     242}
     243
     244.side-info ul
     245{
     246    padding-left:0;
     247    padding-right:18px
     248}
     249
     250.form-table table.color-palette {
     251    float:right;
     252}
     253
     254#pass-strength-result
     255{
     256    float:right;
    206257    margin-right:0;
    207     margin-left:4px;
    208 }
    209 #poststuff #edButtonPreview, #poststuff #edButtonHTML {
    210     margin: 5px 0 0 8px;
    211     float: left;
    212 }
    213 #poststuff #media-buttons {
    214     float: left;
     258    margin-left:5px;
     259}
     260
     261td.comment p.comment-author img.avatar
     262{
     263    float:right !important;
     264    margin-right:0 !important;
     265    margin-left:8px !important;
     266}
     267
     268#footer
     269{
     270    padding:10px 0 0
     271}
     272
     273#footer p
     274{
     275    height:35px;
     276    margin-right:20px;
     277    padding:12px 40px 0 0;
     278}
     279
     280#submenu,#wpbody
     281{
     282    clear:both;
     283}
     284
     285#submenu li,ul.subsubsub li a
     286{
     287    padding:0;
     288}
     289
     290table.widefat th,.form-table th
     291{
     292    text-align:right
     293}
     294
     295.widefat th input {
     296    margin: 0 8px 0 0;
     297    padding: 0;
     298}
     299
     300.available-theme,#tagchecklist span a
     301{
     302    float:right
     303}
     304#template div {
    215305    margin-right:0;
    216     margin-left: 20px;
    217 }
    218 #poststuff #media-buttons a {
    219     padding: 0 2px 2px 5px;
    220 }
    221 #poststuff .togbox {
    222     margin-left:0;
    223     margin-right: -21px;
    224     -moz-border-radius-topleft:0;
    225     -khtml-border-top-left-radius:0;
    226     -webkit-border-top-left-radius:0;
    227     border-top-left-radius:0;
    228     -moz-border-radius-topright: 3px;
    229     -khtml-border-top-right-radius: 3px;
    230     -webkit-border-top-right-radius: 3px;
    231     border-top-right-radius: 3px;
    232     -moz-border-radius-bottomleft: 0;
    233     -khtml-border-bottom-left-radius:0;
    234     -webkit-border-bottom-left-radius:0;
    235     border-bottom-left-radius:0;
    236     -moz-border-radius-bottomright: 3px;
    237     -khtml-border-bottom-right-radius: 3px;
    238     -webkit-border-bottom-right-radius: 3px;
    239     border-bottom-right-radius: 3px;
    240 }
    241 .submitbox .submitdelete {
    242     margin-left:0;
    243     margin-right:8px;
     306    margin-left:190px;
    244307}
    245308.submitbox .submit {
    246309    text-align:right;
    247310}
    248 .submitbox .submit input {
    249     margin-right:0;
    250     margin-left:3px;
    251 }
    252 #categorydiv #category-adder {
    253     margin-left:0;
    254     margin-right: 120px;
    255 }
    256 #categorydiv ul#category-tabs {
    257     float: right;
    258     text-align: left;
    259     margin: 0 0 0 -120px;
    260 }
    261 ul#category-tabs li.ui-tabs-selected {
    262     -moz-border-radius-topleft:0;
    263     -khtml-border-top-left-radius:0;
    264     -webkit-border-top-left-radius:0;
    265     border-top-left-radius:0;
    266     -moz-border-radius-bottomleft:0;
    267     -khtml-border-bottom-left-radius:0;
    268     -webkit-border-bottom-left-radius:0;
    269     border-bottom-left-radius:0;
    270     -moz-border-radius-topright: 3px;
    271     -khtml-border-top-right-radius: 3px;
    272     -webkit-border-top-right-radius: 3px;
    273     border-top-right-radius: 3px;
    274     -moz-border-radius-bottomright: 3px;
    275     -khtml-border-bottom-right-radius: 3px;
    276     -webkit-border-bottom-right-radius: 3px;
    277     border-bottom-right-radius: 3px;
    278 }
    279 div.ui-tabs-panel {
    280     margin: 0 120px 0 5px;
    281 }
    282 /* 1305 - elakh! :-)
    283 =================================== */
    284 #categorydiv ul.categorychecklist ul {
    285     margin-left:0;
    286     margin-right: 18px;
    287 }
    288 #linkcategorydiv #category-adder {
    289     margin-left:0;
    290     margin-right: 120px;
    291 }
    292 #linkcategorydiv ul#category-tabs {
    293     float: right;
    294     text-align: left;
    295     margin: 0 0 0 -120px;
    296 }
    297 #linkcategorydiv ul.categorychecklist ul {
    298     margin-left:0;
    299     margin-right: 18px;
    300 }
    301 p#tag-search, p#post-search {
    302     right:auto;
    303     left:0;
    304 }
    305 #posts-filter fieldset {
    306     float: right;
    307     margin: 0 0 1em 1.5ex;
    308 }
    309 #posts-filter fieldset legend {
    310     padding: 0 1px .2em 0;
    311 }
    312 ul.view-switch {
    313     float: left;
    314     margin: -23px 0 -2px 5px;
    315 }
    316 ul.view-switch li {
    317     float: right;
    318 }
    319 #the-comment-list td.comment p.comment-author {
    320     margin-right: 0 ;
    321 }
    322 #the-comment-list p.comment-author img {
    323     float: right;
    324     margin-right:0;
    325     margin-left: 8px;
    326 }
    327 #the-comment-list td.comment p {
    328     margin-left:0;
    329     margin-right: 8px;
    330 }
    331 .curtime {
    332     background-position: right 2px;
    333     padding-left:0;
    334     padding-right: 18px;
    335 }
    336 .tablenav .delete {
    337     margin-right:0;
    338     margin-left: 20px;
    339 }
    340 #tTips {
    341 }
    342 td.action-links, th.action-links {
    343     text-align:left;
    344 }
    345 .info-box {
    346     left:auto;
    347     right: 50%;
    348     margin-left: 0;
    349     margin-right: -225px;
    350 }
    351 .info-box .gears-img {
    352     float: left;
    353 }
    354 /* LTR
    355 =================================== */
    356 #edit-slug-box, #trackback, #metakeyinput, #post_password, #link_url, #link_image, #rss_uri, #category_nicename, #slug, #dbuser, #dbpass, #dbname, #dbprefix, #dccharset, #gmpath, #archivespath, #lastentry, #dbhost, #pages-exclude, #newcontent, #email, #newcomment_author_url, #siteurl, #home, #admin_email, #date_format, #time_format, #gmt_offset, #mailserver_url, #mailserver_port, #mailserver_login, #mailserver_pass, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #moderation_keys, #blacklist_keys, #comment_max_links, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #key, #src, #hostname, #username, #password, #rules {
    357     direction:ltr;
    358 }
    359 /* TinyMCE
    360 =================================== */
    361 .clearlooks2 .mceTop .mceLeft {
    362     width:100% !important;
    363 }
     311
     312#editorcontainer {
     313    border:1px solid;
     314}
     315
     316.wrap h2 {
     317    margin: 5px -4px 0 0;
     318    padding-right: 0px;
     319    padding-left: 280px;
     320}
     321
     322div#message {
     323    clear: both;
     324}
  • tags/2.6/wp-app.php

    r8652 r8652  
    207207                // authenticate regardless of the operation and set the current
    208208                // user. each handler will decide if auth is required or not.
    209                 if(!$this->authenticate()) {
     209                $this->authenticate();
     210                $u = wp_get_current_user();
     211                if(!isset($u) || $u->ID == 0) {
    210212                    if ($always_authenticate) {
    211213                        $this->auth_required('Credentials required.');
     
    393395
    394396        $publish = (isset($parsed->draft) && trim($parsed->draft) == 'yes') ? false : true;
    395         $post_status = ($publish) ? 'publish' : 'draft';
    396397
    397398        extract($entry);
     
    406407        $post_modified = $pubtimes[0];
    407408        $post_modified_gmt = $pubtimes[1];
     409
     410        // let's not go backwards and make something draft again.
     411        if(!$publish && $post_status == 'draft') {
     412            $post_status = ($publish) ? 'publish' : 'draft';
     413        } elseif($publish) {
     414            $post_status = 'publish';
     415        }
    408416
    409417        $postdata = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt');
     
    10631071     */
    10641072    function authenticate() {
     1073        $login_data = array();
     1074        $already_md5 = false;
     1075
    10651076        log_app("authenticate()",print_r($_ENV, true));
    10661077
     
    10741085        // If Basic Auth is working...
    10751086        if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
    1076             log_app("Basic Auth",$_SERVER['PHP_AUTH_USER']);
    1077             $user = wp_authenticate($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']);
    1078             if ( $user && !is_wp_error($user) ) {
    1079                 wp_set_current_user($user->ID);
    1080                 log_app("authenticate()", $_SERVER['PHP_AUTH_USER']);
    1081                 return true;
     1087            $login_data = array('login' => $_SERVER['PHP_AUTH_USER'],   'password' => $_SERVER['PHP_AUTH_PW']);
     1088            log_app("Basic Auth",$login_data['login']);
     1089        } else {
     1090            // else, do cookie-based authentication
     1091            if (function_exists('wp_get_cookie_login')) {
     1092                $login_data = wp_get_cookie_login();
     1093                $already_md5 = true;
    10821094            }
    10831095        }
    10841096
    1085         return false;
     1097        // call wp_login and set current user
     1098        if (!empty($login_data) && wp_login($login_data['login'], $login_data['password'], $already_md5)) {
     1099             $current_user = new WP_User(0, $login_data['login']);
     1100             wp_set_current_user($current_user->ID);
     1101            log_app("authenticate()",$login_data['login']);
     1102        }
    10861103    }
    10871104
  • tags/2.6/wp-content/plugins

    • Property svn:externals
      •  

        old new  
        1 akismet http://plugins.svn.wordpress.org/akismet/trunk/
         1akismet http://svn.wp-plugins.org/akismet/trunk/
  • tags/2.6/wp-content/themes/default/images/header-img.php

    • Property svn:eol-style deleted
  • tags/2.6/wp-includes/Text/Diff.php

    r8652 r8652  
    5050        }
    5151
    52         // WP #7391
    53         require_once dirname(__FILE__).'/Diff/Engine/' . $engine . '.php';
     52        require_once 'Text/Diff/Engine/' . $engine . '.php';
    5453        $class = 'Text_Diff_Engine_' . $engine;
    5554        $diff_engine = new $class();
  • tags/2.6/wp-includes/Text/Diff/Renderer/inline.php

    r8652 r8652  
    1515
    1616/** Text_Diff_Renderer */
    17 
    18 // WP #7391
    19 require_once dirname(dirname(__FILE__)) . '/Renderer.php';
     17require_once 'Text/Diff/Renderer.php';
    2018
    2119/**
  • tags/2.6/wp-includes/bookmark-template.php

    r8652 r8652  
    7777        if ( $show_updated )
    7878            if ( '00' != substr($bookmark->link_updated_f, 0, 2) ) {
    79                 $title .= ' (';
     79                $title .= ' ';
    8080                $title .= sprintf(__('Last updated: %s'), date(get_option('links_updated_date_format'), $bookmark->link_updated_f + (get_option('gmt_offset') * 3600)));
    8181                $title .= ')';
  • tags/2.6/wp-includes/canonical.php

    r8652 r8652  
    166166            foreach ( array('single', 'category', 'page', 'day', 'month', 'year') as $type ) {
    167167                $func = 'is_' . $type;
    168                 if ( call_user_func($func) ) {
     168                if ( call_user_func($func) )
    169169                    $user_ts_type = $type;
    170170                    break;
    171171                }
    172172            }
    173         }
    174173        $redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
    175174    } elseif ( is_home() ) {
  • tags/2.6/wp-includes/classes.php

    r8652 r8652  
    111111
    112112                    // Substitute the substring matches into the query.
    113                     eval("\$query = \"" . addslashes($query) . "\";");
     113                    eval("\$query = \"$query\";");
    114114                    $this->matched_query = $query;
    115115
  • tags/2.6/wp-includes/cron.php

    r8652 r8652  
    134134    $schedules = array(
    135135        'hourly' => array( 'interval' => 3600, 'display' => __('Once Hourly') ),
    136         'twicedaily' => array( 'interval' => 43200, 'display' => __('Twice Daily') ),
    137136        'daily' => array( 'interval' => 86400, 'display' => __('Once Daily') ),
    138137    );
  • tags/2.6/wp-includes/functions.php

    r8652 r8652  
    342342        if ( false === $value ) {
    343343            if ( defined( 'WP_INSTALLING' ) )
    344                 $suppress = $wpdb->suppress_errors();
     344                $supress = $wpdb->suppress_errors();
    345345            // expected_slashed ($setting)
    346346            $row = $wpdb->get_row( "SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1" );
     
    631631 */
    632632function maybe_serialize( $data ) {
    633     if ( is_array( $data ) || is_object( $data ) )
     633    if ( is_string( $data ) )
     634        return $data;
     635    elseif ( is_array( $data ) || is_object( $data ) )
    634636        return serialize( $data );
    635 
    636637    if ( is_serialized( $data ) )
    637638        return serialize( $data );
    638 
    639639    return $data;
    640640}
     
    14821482    $siteurl = get_option( 'siteurl' );
    14831483    $upload_path = get_option( 'upload_path' );
    1484     $upload_path = trim($upload_path);
    1485     if ( empty($upload_path) )
    1486         $dir = WP_CONTENT_DIR . '/uploads';
    1487     else
    1488         $dir = $upload_path;
     1484    if ( trim($upload_path) === '' )
     1485        $upload_path = WP_CONTENT_DIR . '/uploads';
     1486    $dir = $upload_path;
    14891487
    14901488    // $dir is absolute, $path is (maybe) relative to ABSPATH
    1491     $dir = path_join( ABSPATH, $dir );
    1492    
    1493     if ( !$url = get_option( 'upload_url_path' ) ) {
    1494         if ( empty($upload_path) or ( $upload_path == $dir ) )
    1495             $url = WP_CONTENT_URL . '/uploads';
    1496         else
    1497             $url = trailingslashit( $siteurl ) . $upload_path;
    1498     }
     1489    $dir = path_join( ABSPATH, $upload_path );
     1490
     1491    if ( !$url = get_option( 'upload_url_path' ) )
     1492        $url = WP_CONTENT_URL . '/uploads';
    14991493
    15001494    if ( defined('UPLOADS') ) {
     
    15241518        return array( 'error' => $message );
    15251519    }
    1526    
     1520
    15271521    $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
    1528 
    15291522    return apply_filters( 'upload_dir', $uploads );
    15301523}
  • tags/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

    r8652 r8652  
    55<title></title>
    66
    7 <script type="text/javascript" src="js/editimage.js?ver=311g"></script>
     7<script type="text/javascript" src="js/editimage.js?ver=311d"></script>
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
    99
    10 <link rel="stylesheet" href="css/editimage.css?ver=311g" type="text/css" media="all" />
    11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6.1" type="text/css" media="all" />
     10<link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" />
     11<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta3" type="text/css" media="all" />
    1212<script type="text/javascript">
    1313if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
  • tags/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

    r8652 r8652  
    1616                    return;
    1717
    18                 tb_show('', url + '/editimage.html?ver=311g&TB_iframe=true');
     18                tb_show('', url + '/editimage.html?ver=311c&TB_iframe=true');
    1919                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
    2020            });
  • tags/2.6/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

    r8652 r8652  
    8080        for ( i = 0; i < styles.length; i++ ) {
    8181            var url = styles.item(i).href;
    82             if ( url && url.indexOf('colors') != -1 )
     82            if ( url && url.indexOf('colors-') != -1 )
    8383                document.write( '<link rel="stylesheet" href="'+url+'" type="text/css" media="all" />' );
    8484        }
     
    246246
    247247    setup : function() {
    248         var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = '';
     248        var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null;
    249249        document.dir = tinyMCEPopup.editor.getParam('directionality','');
    250250
    251         if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )
     251        if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) )
    252252            t.I('cap_field').style.display = 'none';
    253253
  • tags/2.6/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css

    r8652 r8652  
    99h6 {font-size: .75em}
    1010.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
    11 a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
    12 img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}
     11a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
     12img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
    1313img {border:0;}
    1414table {cursor:default}
  • tags/2.6/wp-includes/js/tinymce/tiny_mce_config.php

    r8652 r8652  
    131131$mce_buttons_4 = implode($mce_buttons_4, ',');
    132132
    133 $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false;
     133$do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true;
    134134
    135135// TinyMCE init settings
     
    166166    'content_css' => "$mce_css",
    167167    'save_callback' => 'switchEditors.saveCallback',
    168     'wpeditimage_disable_captions' => $no_captions,
     168    'wpeditimage_do_captions' => $do_captions,
    169169    'plugins' => "$plugins",
    170170    // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
     
    226226if ( $disk_cache ) {
    227227
    228     $cacheKey = apply_filters('tiny_mce_version', '20080810');
     228    $cacheKey = apply_filters('tiny_mce_version', '20080710');
    229229
    230230    foreach ( $initArray as $v )
  • tags/2.6/wp-includes/js/tinymce/wordpress.css

    r8652 r8652  
    7777}
    7878
     79img.mceItemAnchor {
     80    width: 12px;
     81    height: 12px;
     82    background: url(img/items.gif) no-repeat;
     83}
     84
     85a.mceItemAnchor {
     86    width: 12px;
     87    line-height: 6px;
     88    overflow: hidden;
     89    padding-left: 12px;
     90    background: url(img/items.gif) no-repeat bottom left;
     91}
     92
    7993.mceIEcenter {
    8094    text-align: center;
  • tags/2.6/wp-includes/js/wp-lists.js

    r8652 r8652  
    8888            var res = wpAjax.parseAjaxResponse(r, s.response, s.element);
    8989            if ( !res || res.errors ) { return false; }
    90 
    91             if ( true === res ) { return true; }
    9290
    9391            jQuery.each( res.responses, function() {
  • tags/2.6/wp-includes/kses.php

    r8652 r8652  
    432432        if ( $string == '' )
    433433            return '';
    434         // prevent multiple dashes in comments
    435         $string = preg_replace('/--+/', '-', $string);
    436         // prevent three dashes closing a comment
    437         $string = preg_replace('/-$/', '', $string);
    438434        return "<!--{$string}-->";
    439435    }
     
    538534 * or apostrophes around them, to make it easier to produce HTML code that will
    539535 * conform to W3C's HTML specification. It will also remove bad URL protocols
    540  * from attribute values.  It also reduces duplicate attributes by using the
    541  * attribute defined first (foo='bar' foo='baz' will result in foo='bar').
     536 * from attribute values.
    542537 *
    543538 * @since 1.0.0
     
    582577                    $working = 1;
    583578                    $mode = 0;
    584                     if(FALSE === array_key_exists($attrname, $attrarr)) {
    585                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
    586                     }
     579                    $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
    587580                    $attr = preg_replace('/^\s+/', '', $attr);
    588581                }
     
    597590                    $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
    598591
    599                     if(FALSE === array_key_exists($attrname, $attrarr)) {
    600                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
    601                     }
     592                    $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
    602593                    $working = 1;
    603594                    $mode = 0;
     
    611602                    $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
    612603
    613                     if(FALSE === array_key_exists($attrname, $attrarr)) {
    614                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
    615                     }
     604                    $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
    616605                    $working = 1;
    617606                    $mode = 0;
     
    625614                    $thisval = wp_kses_bad_protocol($match[1], $allowed_protocols);
    626615
    627                     if(FALSE === array_key_exists($attrname, $attrarr)) {
    628                         $attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
    629                     }
     616                    $attrarr[] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
    630617                    # We add quotes to conform to W3C's HTML spec.
    631618                    $working = 1;
     
    644631    } # while
    645632
    646     if ($mode == 1 && FALSE === array_key_exists($attrname, $attrarr))
     633    if ($mode == 1)
    647634        # special case, for when the attribute list ends with a valueless
    648635        # attribute like "selected"
    649         $attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
     636        $attrarr[] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
    650637
    651638    return $attrarr;
  • tags/2.6/wp-includes/l10n.php

    r8652 r8652  
    243243    global $l10n;
    244244
     245    if (isset($l10n[$domain]))
     246        return;
     247
    245248    if ( is_readable($mofile))
    246249        $input = new CachedFileReader($mofile);
     
    248251        return;
    249252
    250     $gettext = new gettext_reader($input);
    251 
    252     if (isset($l10n[$domain])) {
    253         $l10n[$domain]->load_tables();
    254         $gettext->load_tables();
    255         $l10n[$domain]->cache_translations = array_merge($gettext->cache_translations, $l10n[$domain]->cache_translations);
    256     } else
    257         $l10n[$domain] = $gettext;
    258 
    259     unset($input, $gettext);
     253    $l10n[$domain] = new gettext_reader($input);
    260254}
    261255
     
    263257 * load_default_textdomain() - Loads default translated strings based on locale
    264258 *
    265  * Loads the .mo file in WP_LANG_DIR constant path from WordPress root.
     259 * Loads the .mo file in LANGDIR constant path from WordPress root.
    266260 * The translated (.mo) file is named based off of the locale.
    267261 *
     
    271265    $locale = get_locale();
    272266
    273     $mofile = WP_LANG_DIR . "/$locale.mo";
     267    $mofile = ABSPATH . LANGDIR . "/$locale.mo";
    274268
    275269    load_textdomain('default', $mofile);
  • tags/2.6/wp-includes/link-template.php

    r8652 r8652  
    480480    endswitch;
    481481   
    482     return apply_filters( 'get_edit_post_link', admin_url("$file.php?{$action}$var=$post->ID"), $post->ID, $context );
     482    return apply_filters( 'get_edit_post_link', get_bloginfo( 'wpurl' ) . "/wp-admin/$file.php?{$action}$var=$post->ID", $post->ID );
    483483}
    484484
     
    510510    }
    511511
    512     $location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
     512    $location = get_bloginfo( 'wpurl' ) . '/wp-admin/comment.php?action=editcomment&amp;c=' . $comment->comment_ID;
    513513    return apply_filters( 'get_edit_comment_link', $location );
    514514}
  • tags/2.6/wp-includes/media.php

    r8652 r8652  
    355355
    356356function img_caption_shortcode($attr, $content = null) {
     357
     358    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
     359        return $content;
    357360
    358361    // Allow plugins/themes to override the default caption template.
  • tags/2.6/wp-includes/pluggable.php

    r8652 r8652  
    15131513    $args = wp_parse_args( $args, $defaults );
    15141514
     1515    // PEAR Text_Diff is lame; it includes things from include_path rather than it's own path.
     1516    // Not sure of the ramifications of disttributing modified code.
     1517    ini_set('include_path', '.' . PATH_SEPARATOR . ABSPATH . WPINC );
     1518
    15151519    if ( !class_exists( 'WP_Text_Diff_Renderer_Table' ) )
    15161520        require( ABSPATH . WPINC . '/wp-diff.php' );
     
    15311535    $diff = $renderer->render($text_diff);
    15321536
     1537    ini_restore('include_path');
     1538
    15331539    if ( !$diff )
    15341540        return '';
  • tags/2.6/wp-includes/post.php

    r8652 r8652  
    511511function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
    512512    global $wpdb;
    513 
    514     // make sure meta is added to the post, not a revision
    515     if ( $the_post = wp_is_post_revision($post_id) )
    516         $post_id = $the_post;
    517513
    518514    // expected_slashed ($meta_key)
     
    12771273
    12781274    // If the post date is empty (due to having been new or a draft) and status is not 'draft', set date to now
    1279     if ( empty($post_date) || '0000-00-00 00:00:00' == $post_date ) {
     1275    if (empty($post_date)) {
    12801276        if ( !in_array($post_status, array('draft', 'pending')) )
    12811277            $post_date = current_time('mysql');
     
    12841280    }
    12851281
    1286     if ( empty($post_date_gmt) || '0000-00-00 00:00:00' == $post_date_gmt ) {
     1282    if (empty($post_date_gmt)) {
    12871283        if ( !in_array($post_status, array('draft', 'pending')) )
    12881284            $post_date_gmt = get_gmt_from_date($post_date);
     
    31183114        $fields = array(
    31193115            'post_title' => __( 'Title' ),
     3116            'post_author' => __( 'Author' ),
    31203117            'post_content' => __( 'Content' ),
    31213118            'post_excerpt' => __( 'Excerpt' ),
     
    31263123
    31273124        // WP uses these internally either in versioning or elsewhere - they cannot be versioned
    3128         foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect )
     3125        foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count' ) as $protect )
    31293126            unset( $fields[$protect] );
    31303127    }
  • tags/2.6/wp-includes/query.php

    r8652 r8652  
    774774
    775775        if ( !empty($qv['post_status']) )
    776             $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
     776            $qv['post_status'] = sanitize_user($qv['post_status'], true);
    777777
    778778        if ( $this->is_posts_page && !$qv['withcomments'] )
     
    11241124            $include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
    11251125            $whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
    1126             $reqtag = get_term_by( 'slug', $q['tag_slug__in'][0], 'post_tag' );
     1126            $reqtag = is_term( $q['tag_slug__in'][0], 'post_tag' );
    11271127            if ( !empty($reqtag) )
    1128                 $q['tag_id'] = $reqtag->term_id;
     1128                $q['tag_id'] = $reqtag['term_id'];
    11291129        }
    11301130
  • tags/2.6/wp-includes/rewrite.php

    r8652 r8652  
    6868  */
    6969function _wp_filter_taxonomy_base( $base ) {
    70     if ( !empty( $base ) ) {
    71         $base = preg_replace( '|^/index\.php/|', '', $base );
    72         $base = trim( $base, '/' );
    73     }
     70    if ( !empty( $base ) )
     71        $base = preg_replace( '|^/index\.php/|', '/', $base );
    7472    return $base;
    7573}
     
    153151
    154152            // Substitute the substring matches into the query.
    155             eval("\$query = \"" . addslashes($query) . "\";");
     153            eval("\$query = \"$query\";");
    156154            // Filter out non-public query vars
    157155            global $wp;
     
    448446
    449447        if (empty($this->category_base))
    450             $this->category_structure = trailingslashit( $this->front . 'category' );
     448            $this->category_structure = $this->front . 'category/';
    451449        else
    452             $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
     450            $this->category_structure = $this->category_base . '/';
    453451
    454452        $this->category_structure .= '%category%';
     
    468466
    469467        if (empty($this->tag_base))
    470             $this->tag_structure = trailingslashit( $this->front . 'tag' );
     468            $this->tag_structure = $this->front . 'tag/';
    471469        else
    472             $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
     470            $this->tag_structure = $this->tag_base . '/';
    473471
    474472        $this->tag_structure .= '%tag%';
     
    996994            $this->root = $this->index . '/';
    997995        }
    998         $this->category_base = get_option( 'category_base' );
    999         $this->tag_base = get_option( 'tag_base' );
     996        $this->category_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'category_base' );
     997        $this->tag_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'tag_base' );
    1000998        unset($this->category_structure);
    1001999        unset($this->author_structure);
  • tags/2.6/wp-includes/script-loader.php

    r8652 r8652  
    3838
    3939    // Modify this version when tinyMCE plugins are changed.
    40     $mce_version = apply_filters('tiny_mce_version', '20080810');
     40    $mce_version = apply_filters('tiny_mce_version', '20080710');
    4141    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
    4242
     
    5151    $scripts->add( 'autosave', '/wp-includes/js/autosave.js', array('schedule', 'wp-ajax-response'), '20080622' );
    5252
    53     $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080729' );
     53    $scripts->add( 'wp-lists', '/wp-includes/js/wp-lists.js', array('wp-ajax-response'), '20080411' );
    5454    $scripts->localize( 'wp-lists', 'wpListL10n', array(
    5555        'url' => admin_url('admin-ajax.php')
     
    126126        ) );
    127127        $scripts->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );
    128         $scripts->add( 'admin-forms', '/wp-admin/js/forms.js', array('jquery'), '20080729');
     128        $scripts->add( 'admin-forms', '/wp-admin/js/forms.js', false, '20080401');
    129129        $scripts->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
    130130        $scripts->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
     
    195195        ));
    196196       
    197         $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080721' );
     197        $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080511' );
    198198        $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
    199199            'updateCompleted' => __('Update completed.'),
  • tags/2.6/wp-includes/streams.php

    r8652 r8652  
    5959    $this->_str = $str;
    6060    $this->_pos = 0;
    61     // If string functions are overloaded, we need to use the mb versions
    62     $this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
    63   }
    64 
    65   function _substr($string, $start, $length) {
    66     if ($this->is_overloaded) {
    67         return mb_substr($string,$start,$length,'ascii');
    68     } else {
    69         return substr($string,$start,$length);
    70     }
    71   }
    72 
    73   function _strlen($string) {
    74     if ($this->is_overloaded) {
    75         return mb_strlen($string,'ascii');
    76     } else {
    77         return strlen($string);
    78     }
    7961  }
    8062
    8163  function read($bytes) {
    82       $data = $this->_substr($this->_str, $this->_pos, $bytes);
     64    $data = substr($this->_str, $this->_pos, $bytes);
    8365    $this->_pos += $bytes;
    84     if ($this->_strlen($this->_str)<$this->_pos)
    85       $this->_pos = $this->_strlen($this->_str);
     66    if (strlen($this->_str)<$this->_pos)
     67      $this->_pos = strlen($this->_str);
    8668
    8769    return $data;
     
    9072  function seekto($pos) {
    9173    $this->_pos = $pos;
    92     if ($this->_strlen($this->_str)<$this->_pos)
    93       $this->_pos = $this->_strlen($this->_str);
     74    if (strlen($this->_str)<$this->_pos)
     75      $this->_pos = strlen($this->_str);
    9476    return $this->_pos;
    9577  }
     
    10082
    10183  function length() {
    102     return $this->_strlen($this->_str);
     84    return strlen($this->_str);
    10385  }
     86
    10487}
    10588
     
    167150class CachedFileReader extends StringReader {
    168151  function CachedFileReader($filename) {
    169     parent::StringReader();
    170 
    171152    if (file_exists($filename)) {
    172153
     
    175156
    176157      if (!$fd) {
    177         $this->error = 3; // Cannot read file, probably permissions
    178         return false;
     158    $this->error = 3; // Cannot read file, probably permissions
     159    return false;
    179160      }
    180161      $this->_str = fread($fd, $length);
     162      $this->_pos = 0;
    181163      fclose($fd);
    182164
  • tags/2.6/wp-includes/taxonomy.php

    r8652 r8652  
    762762    global $wpdb;
    763763
    764     $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
    765     $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
    766 
    767764    if ( is_int($term) ) {
    768765        if ( 0 == $term )
    769766            return 0;
    770         $where = 't.term_id = %d';
    771         if ( !empty($taxonomy) )
    772             return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
    773         else
    774             return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
    775     }
    776 
    777     if ( '' === $slug = sanitize_title($term) )
    778         return 0;
    779 
    780     $where = 't.slug = %s';
    781     $else_where = 't.name = %s';
    782 
    783     if ( !empty($taxonomy) ) {
    784         if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $slug, $taxonomy), ARRAY_A) )
    785             return $result;
    786            
    787         return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
    788     }
    789 
    790     if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $slug) ) )
    791         return $result;
    792 
    793     return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where", $term) );
     767        $where = $wpdb->prepare( "t.term_id = %d", $term );
     768    } else {
     769        if ( '' === $term = sanitize_title($term) )
     770            return 0;
     771        $where = $wpdb->prepare( "t.slug = %s", $term );
     772    }
     773
     774    if ( !empty($taxonomy) )
     775        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $taxonomy), ARRAY_A);
     776
     777    return $wpdb->get_var("SELECT term_id FROM $wpdb->terms as t WHERE $where");
    794778}
    795779
     
    12161200        return new WP_Error('invalid_term_id', __('Invalid term ID'));
    12171201
    1218     if ( '' == trim($term) )
    1219         return new WP_Error('empty_term_name', __('A name is required for this term'));
    1220 
    12211202    $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
    12221203    $args = wp_parse_args($args, $defaults);
     
    14881469    $name = stripslashes($name);
    14891470    $description = stripslashes($description);
    1490 
    1491     if ( '' == trim($name) )
    1492         return new WP_Error('empty_term_name', __('A name is required for this term'));
    14931471
    14941472    $empty_slug = false;
  • tags/2.6/wp-includes/theme.php

    r8652 r8652  
    487487        return;
    488488
    489     $_GET[template] = preg_replace('|[^a-z0-9_.-]|i', '', $_GET[template]);
    490 
    491     if ( validate_file($_GET[template]) )
    492         return;
     489    $_GET[template] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[template]);
    493490
    494491    add_filter('template', create_function('', "return '$_GET[template]';") );
    495492
    496493    if ( isset($_GET['stylesheet']) ) {
    497         $_GET[stylesheet] = preg_replace('|[^a-z0-9_.-]|i', '', $_GET[stylesheet]);
    498         if ( validate_file($_GET[stylesheet]) )
    499             return;
     494        $_GET[stylesheet] = preg_replace('|[^a-z0-9_-]|i', '', $_GET[stylesheet]);
    500495        add_filter('stylesheet', create_function('', "return '$_GET[stylesheet]';") );
    501496    }
  • tags/2.6/wp-includes/update.php

    r8652 r8652  
    9191        return false;
    9292
     93    $current = get_option( 'update_plugins' );
     94
     95    $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
     96
    9397    // If running blog-side, bail unless we've not checked in the last 12 hours
    94     if ( !function_exists( 'get_plugins' ) )
     98    if ( !function_exists( 'get_plugins' ) ) {
     99        if ( $time_not_changed )
     100            return false;
    95101        require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
     102    }
    96103
    97104    $plugins = get_plugins();
    98105    $active  = get_option( 'active_plugins' );
    99     $current = get_option( 'update_plugins' );
    100106
    101107    $new_option = '';
    102108    $new_option->last_checked = time();
    103     $time_not_changed = isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked );
    104109
    105110    $plugin_changed = false;
     
    114119        if ( strval($current->checked[ $file ]) !== strval($p['Version']) )
    115120            $plugin_changed = true;
    116     }
    117 
    118     foreach ( (array) $current->response as $plugin_file => $update_details ) {
    119         if ( ! isset($plugins[ $plugin_file ]) ) {
    120             $plugin_changed = true;
    121         }
    122121    }
    123122
     
    156155    update_option( 'update_plugins', $new_option );
    157156}
    158 
    159 function _maybe_update_plugins() {
    160     $current = get_option( 'update_plugins' );
    161     if ( isset( $current->last_checked ) && 43200 > ( time() - $current->last_checked ) )
    162         return;
    163     wp_update_plugins();
    164 }
    165 
    166 add_action( 'load-plugins.php', 'wp_update_plugins' );
    167 add_action( 'admin_init', '_maybe_update_plugins' );
    168 add_action( 'wp_update_plugins', 'wp_update_plugins' );
    169 
    170 if ( !wp_next_scheduled('wp_update_plugins') )
    171     wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
     157if ( defined( 'WP_ADMIN' ) && WP_ADMIN )
     158    add_action( 'admin_init', 'wp_update_plugins' );
     159else
     160    add_action( 'init', 'wp_update_plugins' );
    172161
    173162?>
  • tags/2.6/wp-includes/vars.php

    r8652 r8652  
    3535
    3636// Simple browser detection
    37 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = false;
     37$is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = false;
    3838
    3939if (strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false) {
    4040    $is_lynx = true;
    41 } elseif ( strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') !== false ) {
    42     $is_safari = true;
    4341} elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false) {
    4442    $is_gecko = true;
  • tags/2.6/wp-includes/version.php

    r8652 r8652  
    99 * @global string $wp_version
    1010 */
    11 $wp_version = '2.6.1';
     11$wp_version = '2.6';
    1212
    1313/**
     
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 8204;
     18$wp_db_version = 8201;
    1919
    2020?>
  • tags/2.6/wp-includes/widgets.php

    r8652 r8652  
    5858    );
    5959
    60     $sidebar = array_merge($defaults, (array) $args);
     60    $sidebar = array_merge($defaults, $args);
    6161
    6262    $wp_registered_sidebars[$sidebar['id']] = $sidebar;
     
    10441044    extract($args, EXTR_SKIP);
    10451045    if ( is_numeric($widget_args) )
    1046         $widget_args = array( 'number' => $widget_args );
     1046        $widget_args = array( 'number' => $widegt_args );
    10471047    $widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
    10481048    extract($widget_args, EXTR_SKIP);
     
    11261126                $title = __('Untitled');
    11271127            $desc = '';
     1128                if ( isset( $item['description'] ) && is_string( $item['description'] ) )
     1129                    $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
     1130                elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
     1131                    $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
     1132
    11281133            $summary = '';
    11291134            if ( isset( $item['description'] ) && is_string( $item['description'] ) )
    1130                 $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES))));
     1135                $summary = $item['description'];
    11311136            elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) )
    1132                 $desc = $summary = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES))));
     1137                $summary = $item['summary'];
     1138
     1139            $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($summary, ENT_QUOTES))));
    11331140
    11341141            if ( $show_summary ) {
  • tags/2.6/wp-includes/wp-diff.php

    r8652 r8652  
    22
    33if ( !class_exists( 'Text_Diff' ) ) {
    4     require( dirname(__FILE__).'/Text/Diff.php' );
    5     require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
    6     require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
     4    require( 'Text/Diff.php' );
     5    require( 'Text/Diff/Renderer.php' );
     6    require( 'Text/Diff/Renderer/inline.php' );
    77}
    88
  • tags/2.6/wp-login.php

    r8652 r8652  
    130130    do_action('retrieve_password', $user_login);
    131131
    132     $allow = apply_filters('allow_password_reset', true, $user_data->ID);
    133 
    134     if ( ! $allow )
    135         return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
    136     else if ( is_wp_error($allow) )
    137         return $allow;
    138        
    139132    $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
    140133    if ( empty($key) ) {
  • tags/2.6/wp-settings.php

    r8652 r8652  
    6969    else
    7070    {
    71         // Use ORIG_PATH_INFO if there is no PATH_INFO
    72         if ( !isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']) )
    73             $_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
    74 
    7571        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
    7672        if ( isset($_SERVER['PATH_INFO']) ) {
     
    422418    if ( is_array($current_plugins) ) {
    423419        foreach ($current_plugins as $plugin) {
    424             if ( '' != $plugin && 0 == validate_file($plugin) && file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
     420            if ('' != $plugin && file_exists(WP_PLUGIN_DIR . '/' . $plugin))
    425421                include_once(WP_PLUGIN_DIR . '/' . $plugin);
    426422        }
  • tags/2.6/xmlrpc.php

    r8652 r8652  
    4040    <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
    4141    <apis>
    42       <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php') ?>" />
    43       <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php') ?>" />
    44       <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php') ?>" />
    45       <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php') ?>" />
    46       <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', site_url('wp-app.php/service') ) ?>" />
     42      <api name="WordPress" blogID="1" preferred="true" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
     43      <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
     44      <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
     45      <api name="Blogger" blogID="1" preferred="false" apiLink="<?php bloginfo_rss('wpurl') ?>/xmlrpc.php" />
     46      <api name="Atom" blogID="" preferred="false" apiLink="<?php echo apply_filters('atom_service_url', (get_bloginfo('url')."/wp-app.php/service"))?>" />
    4747    </apis>
    4848  </service>
Note: See TracChangeset for help on using the changeset viewer.