WordPress.org

Make WordPress Core

Changes in / [11532:11549]


Ignore:
Location:
/trunk
Files:
1 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • /trunk/readme.html

    r11532 r11549  
    99<h1 id="logo" style="text-align: center">
    1010    <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
    11     <br /> Version 2.7
     11    <br /> Version 2.8
    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.7:</h2>
     32<h2>Upgrading from any previous WordPress to 2.8:</h2>
    3333<ol>
    3434    <li>Delete your old WP files, saving ones you've modified.</li>
  • /trunk/wp-admin/css/colors-classic.css

    r11532 r11549  
    596596}
    597597
     598.plugin-update-tr .update-message {
     599    background-color: #fffbe4;
     600    border-color: #dfdfdf;
     601}
     602
    598603.plugins .active,
    599604.plugins .active th,
  • /trunk/wp-admin/css/colors-fresh.css

    r11532 r11549  
    591591}
    592592
     593.plugin-update-tr .update-message {
     594    background-color: #fffbe4;
     595    border-color: #dfdfdf;
     596}
     597
    593598.plugins .active,
    594599.plugins .active th,
  • /trunk/wp-admin/css/press-this.css

    r11532 r11549  
    100100
    101101#side-info-column .sleeve {
     102    padding-top: 5px;
    102103    padding-left: 10px;
    103104}
     
    189190#extra_fields #actions {
    190191    clear: both;
    191     position: absolute;
    192     right: 4px;
    193     top: 6px;
    194     margin: 0;
     192    position: relative;
     193    right: 0px;
     194    margin: -24px 0 0;
    195195}
    196196
     
    203203#extra_fields .button {
    204204    margin-right: 5px;
     205    padding: 3px 6px;
     206    border-radius: 10px;
     207    -webkit-border-radius: 10px;
     208    -khtml-border-radius: 10px;
     209    -moz-border-radius: 10px;
    205210}
    206211
     
    217222#img_container {
    218223    background-color: #fff;
    219     height: 101px;
    220     width: 100%;
     224}
     225#img_container_container {
     226    overflow: auto;
    221227}
    222228
     
    347353
    348354#categorydiv div.tabs-panel {
    349     height: 150px;
     355    height: 140px;
    350356    overflow: auto;
    351357}
     
    411417    margin-bottom: 10px;
    412418    border: 0 none;
     419    height: 365px;
    413420}
    414421
  • /trunk/wp-admin/css/theme-install.css

    r11532 r11549  
    125125    float: left;
    126126    margin-bottom: 20px;
    127     width: 725px;
     127    width: 695px;
    128128}
    129129
     
    131131    float: left;
    132132    text-align: right;
    133     width: 65px;
     133    width: 95px;
    134134}
    135135
  • /trunk/wp-admin/includes/plugin-install.php

    r11532 r11549  
    456456                if ( ! empty($installed_plugin) ) {
    457457                    $key = array_shift( $key = array_keys($installed_plugin) ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
    458                     if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '>') ){
     458                    if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
    459459                        $type = 'latest_installed';
    460460                    } elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
  • /trunk/wp-admin/includes/post.php

    r11532 r11549  
    978978    if ( false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%') ) {
    979979        $return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink">' . $permalink . "</span>\n";
    980         $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
     980        if ( current_user_can( 'manage_options' ) )
     981            $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
    981982        if ( isset($view_post) )
    982983            $return .= "<span id='view-post-btn'><a href='$permalink' class='button' target='_blank'>$view_post</a></span>\n";
  • /trunk/wp-admin/includes/template.php

    r11532 r11549  
    16551655        $edit_link = get_edit_post_link( $page->ID );
    16561656        ?>
    1657         <td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_post', $page->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); echo isset($parent_name) ? ' | ' . __('Parent Page: ') . esc_html($parent_name) : ''; ?></strong>
     1657        <td <?php echo $attributes ?>><strong><?php if ( current_user_can( 'edit_page', $page->ID ) ) { ?><a class="row-title" href="<?php echo $edit_link; ?>" title="<?php echo esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)); ?>"><?php echo $pad; echo $title ?></a><?php } else { echo $pad; echo $title; }; _post_states($page); echo isset($parent_name) ? ' | ' . __('Parent Page: ') . esc_html($parent_name) : ''; ?></strong>
    16581658        <?php
    16591659        $actions = array();
  • /trunk/wp-admin/js/common.dev.js

    r11532 r11549  
    242242        return false;
    243243    });
     244   
     245   
    244246});
    245247
    246 (function(){
    247     if ( 'undefined' != typeof google && google.gears ) return;
    248 
    249     var gf = false;
     248jQuery(document).ready( function($){
     249    var turboNag = $('.turbo-nag');
     250
     251    if ( !turboNag.length || ('undefined' != typeof(google) && google.gears) )
     252        return;
     253
    250254    if ( 'undefined' != typeof GearsFactory ) {
    251         gf = new GearsFactory();
     255        return;
    252256    } else {
    253257        try {
    254             if ( window.ActiveXObject ) {
    255                 gf = new ActiveXObject('Gears.Factory');
    256                 if ( gf && gf.getBuildInfo().indexOf('ie_mobile') != -1 )
    257                     gf.privateSetGlobalObject(this);
    258             } else if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) {
    259                 gf = document.createElement("object");
    260                 gf.style.display = "none";
    261                 gf.width = 0;
    262                 gf.height = 0;
    263                 gf.type = "application/x-googlegears";
    264                 document.documentElement.appendChild(gf);
     258            if ( ( 'undefined' != typeof window.ActiveXObject && ActiveXObject('Gears.Factory') ) ||
     259                ( 'undefined' != typeof navigator.mimeTypes && navigator.mimeTypes['application/x-googlegears'] ) ) {
     260                    return;
    265261            }
    266262        } catch(e){}
    267263    }
    268     if ( gf && gf.hasPermission )
    269         return;
    270 
    271     jQuery('.turbo-nag').show();
    272 })();
     264
     265    turboNag.show();
     266
     267});
  • /trunk/wp-admin/js/common.js

    r11532 r11549  
    1 var showNotice,adminMenu,columns;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()})})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});(function(){if("undefined"!=typeof google&&google.gears){return}var a=false;if("undefined"!=typeof GearsFactory){a=new GearsFactory()}else{try{if(window.ActiveXObject){a=new ActiveXObject("Gears.Factory");if(a&&a.getBuildInfo().indexOf("ie_mobile")!=-1){a.privateSetGlobalObject(this)}}else{if(("undefined"!=typeof navigator.mimeTypes)&&navigator.mimeTypes["application/x-googlegears"]){a=document.createElement("object");a.style.display="none";a.width=0;a.height=0;a.type="application/x-googlegears";document.documentElement.appendChild(a)}}}catch(b){}}if(a&&a.hasPermission){return}jQuery(".turbo-nag").show()})();
     1var showNotice,adminMenu,columns;(function(a){adminMenu={init:function(){a("#adminmenu div.wp-menu-toggle").each(function(){if(a(this).siblings(".wp-submenu").length){a(this).click(function(){adminMenu.toggle(a(this).siblings(".wp-submenu"))})}else{a(this).hide()}});this.favorites();a("a.separator").click(function(){if(a("body").hasClass("folded")){adminMenu.fold(1);deleteUserSetting("mfold")}else{adminMenu.fold();setUserSetting("mfold","f")}return false});if(a("body").hasClass("folded")){this.fold()}this.restoreMenuState()},restoreMenuState:function(){a("#adminmenu li.wp-has-submenu").each(function(c,d){var b=getUserSetting("m"+c);if(a(d).hasClass("wp-has-current-submenu")){return true}if("o"==b){a(d).addClass("wp-menu-open")}else{if("c"==b){a(d).removeClass("wp-menu-open")}}})},toggle:function(b){b.slideToggle(150,function(){b.css("display","")}).parent().toggleClass("wp-menu-open");a("#adminmenu li.wp-has-submenu").each(function(d,f){var c=a(f).hasClass("wp-menu-open")?"o":"c";setUserSetting("m"+d,c)});return false},fold:function(b){if(b){a("body").removeClass("folded");a("#adminmenu li.wp-has-submenu").unbind()}else{a("body").addClass("folded");a("#adminmenu li.wp-has-submenu").hoverIntent({over:function(j){var d,c,g,k,i;d=a(this).find(".wp-submenu");c=d.parent().offset().top+d.height()+1;g=a("#wpwrap").height();k=60+c-g;i=a(window).height()+a("body").scrollTop()-15;if(i<(c-k)){k=c-i}if(k>1){d.css({marginTop:"-"+k+"px"})}else{if(d.css("marginTop")){d.css({marginTop:""})}}d.addClass("sub-open")},out:function(){a(this).find(".wp-submenu").removeClass("sub-open").css({marginTop:""})},timeout:220,sensitivity:8,interval:100})}},favorites:function(){a("#favorite-inside").width(a("#favorite-actions").width()-4);a("#favorite-toggle, #favorite-inside").bind("mouseenter",function(){a("#favorite-inside").removeClass("slideUp").addClass("slideDown");setTimeout(function(){if(a("#favorite-inside").hasClass("slideDown")){a("#favorite-inside").slideDown(100);a("#favorite-first").addClass("slide-down")}},200)});a("#favorite-toggle, #favorite-inside").bind("mouseleave",function(){a("#favorite-inside").removeClass("slideDown").addClass("slideUp");setTimeout(function(){if(a("#favorite-inside").hasClass("slideUp")){a("#favorite-inside").slideUp(100,function(){a("#favorite-first").removeClass("slide-down")})}},300)})}};a(document).ready(function(){adminMenu.init()});columns={init:function(){a(".hide-column-tog").click(function(){var c=a(this).val(),b=a(this).attr("checked");if(b){a(".column-"+c).show()}else{a(".column-"+c).hide()}columns.save_manage_columns_state()})},save_manage_columns_state:function(){var b=a(".manage-column").filter(":hidden").map(function(){return this.id}).get().join(",");a.post(ajaxurl,{action:"hidden-columns",hidden:b,screenoptionnonce:a("#screenoptionnonce").val(),page:pagenow})}};a(document).ready(function(){columns.init()})})(jQuery);showNotice={warn:function(){var a=commonL10n.warnDelete||"";if(confirm(a)){return true}return false},note:function(a){alert(a)}};jQuery(document).ready(function(d){var f=false,a,e,c,b;d(".fade").animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300).animate({backgroundColor:"#ffffe0"},300).animate({backgroundColor:"#fffbcc"},300);d("div.wrap h2 ~ div.updated, div.wrap h2 ~ div.error").addClass("below-h2");d("div.updated, div.error").not(".below-h2").insertAfter("div.wrap h2:first");d("#doaction, #doaction2").click(function(){if(d('select[name="action"]').val()=="delete"||d('select[name="action2"]').val()=="delete"){return showNotice.warn()}});d("#show-settings-link").click(function(){if(!d("#screen-options-wrap").hasClass("screen-options-open")){d("#contextual-help-link-wrap").css("visibility","hidden")}d("#screen-options-wrap").slideToggle("fast",function(){if(d(this).hasClass("screen-options-open")){d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#contextual-help-link-wrap").css("visibility","");d(this).removeClass("screen-options-open")}else{d("#show-settings-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("screen-options-open")}});return false});d("#contextual-help-link").click(function(){if(!d("#contextual-help-wrap").hasClass("contextual-help-open")){d("#screen-options-link-wrap").css("visibility","hidden")}d("#contextual-help-wrap").slideToggle("fast",function(){if(d(this).hasClass("contextual-help-open")){d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right.gif")'});d("#screen-options-link-wrap").css("visibility","");d(this).removeClass("contextual-help-open")}else{d("#contextual-help-link").css({backgroundImage:'url("images/screen-options-right-up.gif")'});d(this).addClass("contextual-help-open")}});return false});d("#contextual-help-link-wrap, #screen-options-link-wrap").show();d("table:visible tbody .check-column :checkbox").click(function(g){if("undefined"==g.shiftKey){return true}if(g.shiftKey){if(!f){return true}a=d(f).parents("form:first").find(":checkbox");e=a.index(f);c=a.index(this);b=d(this).attr("checked");if(0<e&&0<c&&e!=c){a.slice(e,c).attr("checked",function(){if(d(this).parents("tr").is(":visible")){return b?"checked":""}return""})}}f=this;return true});d("thead :checkbox, tfoot :checkbox").click(function(i){var j=d(this).attr("checked"),h="undefined"==typeof toggleWithKeyboard?false:toggleWithKeyboard,g=i.shiftKey||h;d(this).parents("form:first").find("table tbody:visible").find(".check-column :checkbox").attr("checked",function(){if(d(this).parents("tr").is(":hidden")){return""}if(g){return d(this).attr("checked")?"":"checked"}else{if(j){return"checked"}}return""});d(this).parents("form:first").find("table thead:visible, table tfoot:visible").find(".check-column :checkbox").attr("checked",function(){if(g){return""}else{if(j){return"checked"}}return""})});d("#default-password-nag-no").click(function(){setUserSetting("default_password_nag","hide");d("div.default-password-nag").hide();return false})});jQuery(document).ready(function(b){var a=b(".turbo-nag");if(!a.length||("undefined"!=typeof(google)&&google.gears)){return}if("undefined"!=typeof GearsFactory){return}else{try{if(("undefined"!=typeof window.ActiveXObject&&ActiveXObject("Gears.Factory"))||("undefined"!=typeof navigator.mimeTypes&&navigator.mimeTypes["application/x-googlegears"])){return}}catch(c){}}a.show()});
  • /trunk/wp-admin/themes.php

    r11532 r11549  
    130130<div id="current-theme">
    131131<?php if ( $ct->screenshot ) : ?>
    132 <img src="<?php echo WP_CONTENT_URL . $ct->stylesheet_dir . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" />
     132<img src="<?php echo content_url($ct->stylesheet_dir . '/' . $ct->screenshot); ?>" alt="<?php _e('Current theme preview'); ?>" />
    133133<?php endif; ?>
    134134<h4><?php
     
    201201    $template_dir = $themes[$theme_name]['Template Dir'];
    202202    $parent_theme = $themes[$theme_name]['Parent Theme'];
    203     $preview_link = esc_url( get_option('home') . '/');
     203    $preview_link = esc_url(get_option('home') . '/');
     204    if ( is_ssl() )
     205        $preview_link = str_replace( 'http://', 'https://', $preview_link );
    204206    $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), $preview_link ) );
    205207    $preview_text = esc_attr( sprintf( __('Preview of &#8220;%s&#8221;'), $title ) );
     
    219221        <a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot">
    220222<?php if ( $screenshot ) : ?>
    221             <img src="<?php echo WP_CONTENT_URL . $stylesheet_dir . '/' . $screenshot; ?>" alt="" />
     223            <img src="<?php echo content_url($stylesheet_dir . '/' . $screenshot); ?>" alt="" />
    222224<?php endif; ?>
    223225        </a>
  • /trunk/wp-admin/wp-admin.css

    r11532 r11549  
    27492749}
    27502750
     2751.inline-edit-row .catshow,
     2752.inline-edit-row .cathide {
     2753    cursor: pointer;
     2754}
     2755
    27512756ul.cat-checklist {
    27522757    height: 12em;
     
    32823287    vertical-align: middle;
    32833288}
     3289
     3290.plugin-update-tr .update-message {
     3291    margin: 5px;
     3292    padding: 3px 5px;
     3293    border-width: 1px;
     3294    border-style: solid;
     3295    -moz-border-radius: 5px;
     3296    -khtml-border-radius: 5px;
     3297    -webkit-border-radius: 5px;
     3298    border-radius: 5px;
     3299}
  • /trunk/wp-includes/functions.php

    r11532 r11549  
    32183218    usort($zonen, create_function(
    32193219        '$a, $b', '
    3220         $a_continent = translate($a["continent"], "continents-cities");
    3221         $b_continent = translate($b["continent"], "continents-cities");
    3222         $a_city = translate($a["city"], "continents-cities");
    3223         $b_city = translate($b["city"], "continents-cities");
    3224         $a_subcity = translate($a["subcity"], "continents-cities");
    3225         $b_subcity = translate($b["subcity"], "continents-cities");
     3220        $t = create_function(\'$s\', \'return translate(str_replace("_", " ", $s), "continents-cities");\');
     3221        $a_continent = $t($a["continent"]);
     3222        $b_continent = $t($b["continent"]);
     3223        $a_city = $t($a["city"]);
     3224        $b_city = $t($b["city"]);
     3225        $a_subcity = $t($a["subcity"]);
     3226        $b_subcity = $t($b["subcity"]);
    32263227        if ( $a_continent == $b_continent && $a_city == $b_city )
    32273228            return strnatcasecmp($a_subcity, $b_subcity);
     
    32473248            if ( !empty($city) ) {
    32483249                $selectcontinent = $continent;
    3249                 $structure .= '<optgroup label="'. esc_attr( translate( $continent ) ) .'">' . "\n"; // continent
     3250                $structure .= '<optgroup label="'. esc_attr( translate( $continent, "continents-cities" ) ) .'">' . "\n"; // continent
    32503251            }
    32513252        }
  • /trunk/wp-includes/general-template.php

    r11532 r11549  
    970970    // Quick check. If we have no posts at all, abort!
    971971    if ( !$posts ) {
    972         $gotsome = $wpdb->get_var("SELECT 1 FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
     972        $gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
    973973        if ( !$gotsome ) {
    974974            $cache[ $key ] = '';
  • /trunk/wp-includes/link-template.php

    r11532 r11549  
    10351035    }
    10361036
    1037     $categories = array_merge($cat_array, $excluded_categories);
     1037    $categories = implode(',', array_merge($cat_array, $excluded_categories) );
    10381038
    10391039    $order = $start ? 'ASC' : 'DESC';
  • /trunk/wp-includes/script-loader.php

    r11532 r11549  
    6161    $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20090102' );
    6262
    63     $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090528' );
     63    $scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), '20090609' );
    6464    $scripts->add_data( 'common', 'group', 1 );
    6565    $scripts->localize( 'common', 'commonL10n', array(
     
    422422
    423423    // all colors stylesheets need to have the same query strings (cache manifest compat)
    424     $colors_version = '20090607';
    425 
    426     $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090607' );
     424    $colors_version = '20090610';
     425
     426    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090610' );
    427427    $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' );
    428428
     
    449449    $styles->add( 'login', '/wp-admin/css/login.css', array(), '20090514' );
    450450    $styles->add( 'plugin-install', '/wp-admin/css/plugin-install.css', array(), '20090514' );
    451     $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090514' );
     451    $styles->add( 'theme-install', '/wp-admin/css/theme-install.css', array(), '20090610' );
    452452    $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.2' );
    453453    $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' );
  • /trunk/wp-includes/theme.php

    r11532 r11549  
    11351135}
    11361136
    1137 /**
    1138  * Get the basename of a theme.
    1139  *
    1140  * This method extracts the filename of a theme file from a path
    1141  *
    1142  * @package WordPress
    1143  * @subpackage Plugin
    1144  * @since 2.8.0
    1145  *
    1146  * @access private
    1147  *
    1148  * @param string $file The filename of a theme file
    1149  * @return string The filename relative to the themes folder
    1150  */
    1151 function theme_basename($file) {
    1152     $file = str_replace('\\','/',$file); // sanitize for Win32 installs
    1153     $file = preg_replace('|/+|','/', $file); // remove any duplicate slash
    1154     $theme_dir = str_replace('\\','/', get_theme_root()); // sanitize for Win32 installs
    1155     $theme_dir = preg_replace('|/+|','/', $theme_dir); // remove any duplicate slash
    1156     $file = preg_replace('|^.*/themes/.*?/|','',$file); // get relative path from theme dir
    1157     return $file;
    1158 }
    1159 
    11601137?>
  • /trunk/wp-includes/version.php

    r11532 r11549  
    99 * @global string $wp_version
    1010 */
    11 $wp_version = '2.8-RC1';
     11$wp_version = '2.8';
    1212
    1313/**
     
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 10851;
     18$wp_db_version = 11548;
    1919
    2020/**
     
    3030 * @global string $manifest_version
    3131 */
    32 $manifest_version = '20090517';
     32$manifest_version = '20090610';
Note: See TracChangeset for help on using the changeset viewer.