<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13255] trunk: Set svn eol-style native on new files</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13255">13255</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-20 21:00:19 +0000 (Sat, 20 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set svn eol-style native on new files</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssdashboardrtldevcss">trunk/wp-admin/css/dashboard-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssglobalrtldevcss">trunk/wp-admin/css/global-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssiertldevcss">trunk/wp-admin/css/ie-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssiedevcss">trunk/wp-admin/css/ie.dev.css</a></li>
<li><a href="#trunkwpadmincssinstallrtldevcss">trunk/wp-admin/css/install-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssloginrtldevcss">trunk/wp-admin/css/login-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssmediartldevcss">trunk/wp-admin/css/media-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssplugininstallrtldevcss">trunk/wp-admin/css/plugin-install-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincsspressthisrtldevcss">trunk/wp-admin/css/press-this-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssthemeeditorrtldevcss">trunk/wp-admin/css/theme-editor-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincsswidgetsrtldevcss">trunk/wp-admin/css/widgets-rtl.dev.css</a></li>
<li><a href="#trunkwpadminincludeswpconfigms">trunk/wp-admin/includes/wp-config.ms</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpincludespluggabledeprecatedphp">trunk/wp-includes/pluggable-deprecated.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkwpadmincssdashboardrtldevcss">trunk/wp-admin/css/dashboard-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssglobalrtldevcss">trunk/wp-admin/css/global-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssiertldevcss">trunk/wp-admin/css/ie-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssiedevcss">trunk/wp-admin/css/ie.dev.css</a></li>
<li><a href="#trunkwpadmincssinstallrtldevcss">trunk/wp-admin/css/install-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssloginrtldevcss">trunk/wp-admin/css/login-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssmediartldevcss">trunk/wp-admin/css/media-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssplugininstallrtldevcss">trunk/wp-admin/css/plugin-install-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincsspressthisrtldevcss">trunk/wp-admin/css/press-this-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssthemeeditorrtldevcss">trunk/wp-admin/css/theme-editor-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincsswidgetsrtldevcss">trunk/wp-admin/css/widgets-rtl.dev.css</a></li>
<li><a href="#trunkwpadminincludeshtaccessms">trunk/wp-admin/includes/htaccess.ms</a></li>
<li><a href="#trunkwpadminincludeswpconfigms">trunk/wp-admin/includes/wp-config.ms</a></li>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenonecolumnpagephp">trunk/wp-content/themes/twentyten/onecolumn-page.php</a></li>
<li><a href="#trunkwpincludesmsfilesphp">trunk/wp-includes/ms-files.php</a></li>
<li><a href="#trunkwpincludespluggabledeprecatedphp">trunk/wp-includes/pluggable-deprecated.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssdashboardrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/dashboard-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/dashboard-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/dashboard-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,96 +1,96 @@
</span><del>-#dashboard-widgets-wrap .has-sidebar {
-        margin-right: 0;
-        margin-left: -51%;
-}
-#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
-        margin-right: 0;
-        margin-left: 51%;
-}
-.view-all {
-        right: auto;
-        left: 0;
-}
-#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
-        font-family: Tahoma, Arial;
-}
-#dashboard_right_now td.b {
-        padding-right: 0;
-        padding-left: 6px;
-        text-align: left;
-        font-family: Tahoma, Arial;
-}
-#dashboard_right_now .t {
-        padding-right: 0;
-        padding-left: 12px;
-}
-#dashboard_right_now .versions a {
-        font-family: Tahoma, Arial;
-}
-#dashboard_right_now a.button {
-        float: left;
-        clear: left;
-}
-#dashboard-widgets h3 .postbox-title-action {
-        right: auto;
-        left: 30px;
-}
-#the-comment-list .pingback {
-        padding-left: 0 !important;
-        padding-right: 9px !important;
-}
-/* Recent Comments */
-#the-comment-list .comment-item {
-        padding: 1em 70px 1em 10px;
-}
-#the-comment-list .comment-item .avatar {
-        float: right;
-        margin-left: 0;
-        margin-right: -60px;
-}
-/* Feeds */
-.rss-widget cite {
-        text-align: left;
-}
-.rss-widget span.rss-date {
-        font-family: Tahoma, Arial;
-        margin-left: 0;
-        margin-right: 3px;
-}
-/* QuickPress */
-#dashboard_quick_press h4 {
-        float: right;
-        text-align: left;
-}
-#dashboard_quick_press h4 label {
-        margin-right: 0;
-        margin-left: 10px;
-}
-#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
-        margin: 0 5em 1em 0;
-}
-#dashboard_quick_press #media-buttons {
-        margin: 0 5em .5em 0;
-        padding: 0 10px 0 0;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit {
-        margin-left: 0;
-        margin-right: 4.6em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit input {
-        float: right;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
-        margin: 0 10px 0 1em;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit #publish {
-        float: left;
-}
-#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
-        margin: 4px 0 0 6px;
-}
-/* Recent Drafts */
-#dashboard_recent_drafts h4 abbr {
-        font-family: Tahoma, Arial;
-        margin-left:0;
-        margin-right: 3px;
-}
</del><ins>+#dashboard-widgets-wrap .has-sidebar {
+        margin-right: 0;
+        margin-left: -51%;
+}
+#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
+        margin-right: 0;
+        margin-left: 51%;
+}
+.view-all {
+        right: auto;
+        left: 0;
+}
+#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve {
+        font-family: Tahoma, Arial;
+}
+#dashboard_right_now td.b {
+        padding-right: 0;
+        padding-left: 6px;
+        text-align: left;
+        font-family: Tahoma, Arial;
+}
+#dashboard_right_now .t {
+        padding-right: 0;
+        padding-left: 12px;
+}
+#dashboard_right_now .versions a {
+        font-family: Tahoma, Arial;
+}
+#dashboard_right_now a.button {
+        float: left;
+        clear: left;
+}
+#dashboard-widgets h3 .postbox-title-action {
+        right: auto;
+        left: 30px;
+}
+#the-comment-list .pingback {
+        padding-left: 0 !important;
+        padding-right: 9px !important;
+}
+/* Recent Comments */
+#the-comment-list .comment-item {
+        padding: 1em 70px 1em 10px;
+}
+#the-comment-list .comment-item .avatar {
+        float: right;
+        margin-left: 0;
+        margin-right: -60px;
+}
+/* Feeds */
+.rss-widget cite {
+        text-align: left;
+}
+.rss-widget span.rss-date {
+        font-family: Tahoma, Arial;
+        margin-left: 0;
+        margin-right: 3px;
+}
+/* QuickPress */
+#dashboard_quick_press h4 {
+        float: right;
+        text-align: left;
+}
+#dashboard_quick_press h4 label {
+        margin-right: 0;
+        margin-left: 10px;
+}
+#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap {
+        margin: 0 5em 1em 0;
+}
+#dashboard_quick_press #media-buttons {
+        margin: 0 5em .5em 0;
+        padding: 0 10px 0 0;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit {
+        margin-left: 0;
+        margin-right: 4.6em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit input {
+        float: right;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #save-post {
+        margin: 0 10px 0 1em;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit #publish {
+        float: left;
+}
+#dashboard-widgets #dashboard_quick_press form p.submit img.waiting {
+        margin: 4px 0 0 6px;
+}
+/* Recent Drafts */
+#dashboard_recent_drafts h4 abbr {
+        font-family: Tahoma, Arial;
+        margin-left:0;
+        margin-right: 3px;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/dashboard-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssglobalrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/global-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/global-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/global-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,82 +1,82 @@
</span><del>-/* 2 column liquid layout */
-#adminmenu {
-        float: right;
-        clear: right;
-        margin-right:-160px;
-        margin-left: 5px;
-}
-body.folded #adminmenu {
-        margin-left: 0;
-        margin-right: -45px;
-}
-/* inner 2 column liquid layout */
-.inner-sidebar {
-        float: left;
-        clear: left;
-}
-
-.has-right-sidebar #post-body {
-        clear:right;
-        float:right;
-        margin-right:0;
-        margin-left:-340px;
-}
-
-.has-right-sidebar #post-body-content {
-        margin-left: 300px;
-        margin-right:0;
-}
-
-#wpbody {
-        margin-left:0;
-        margin-right: 175px;
-}
-.folded #wpbody {
-        margin-left: 0;
-        margin-right: 60px;
-}
-#wpbody-content {
-        float: right;
-}
-/* 2 columns main area */
-#col-right {
-        float: left;
-        clear: left;
-}
-.wrap {
-        margin: 0 5px 0 15px;
-}
-/* styles for use by people extending the WordPress interface */
-body, td, textarea, input, select {
-        font-family: Tahoma, arial;
-}
-.alignleft {
-        float: right;
-}
-.alignright {
-        float: left;
-}
-.subsubsub {
-        float: right;
-}
-.widefat th {
-        text-align: right;
-}
-.widefat th input {
-        margin: 0 8px 0 0;
-}
-.wrap h2 {
-        font-family: arial;
-        padding: 14px 0 3px 15px;
-}
-.wrap h2.long-header {
-        padding-left: 0;
-}
-.updated, .error {
-        clear: both;
-}
-
-.screen-reader-text, .screen-reader-text span {
-        left:auto;
-        text-indent:-1000em;
</del><ins>+/* 2 column liquid layout */
+#adminmenu {
+        float: right;
+        clear: right;
+        margin-right:-160px;
+        margin-left: 5px;
+}
+body.folded #adminmenu {
+        margin-left: 0;
+        margin-right: -45px;
+}
+/* inner 2 column liquid layout */
+.inner-sidebar {
+        float: left;
+        clear: left;
+}
+
+.has-right-sidebar #post-body {
+        clear:right;
+        float:right;
+        margin-right:0;
+        margin-left:-340px;
+}
+
+.has-right-sidebar #post-body-content {
+        margin-left: 300px;
+        margin-right:0;
+}
+
+#wpbody {
+        margin-left:0;
+        margin-right: 175px;
+}
+.folded #wpbody {
+        margin-left: 0;
+        margin-right: 60px;
+}
+#wpbody-content {
+        float: right;
+}
+/* 2 columns main area */
+#col-right {
+        float: left;
+        clear: left;
+}
+.wrap {
+        margin: 0 5px 0 15px;
+}
+/* styles for use by people extending the WordPress interface */
+body, td, textarea, input, select {
+        font-family: Tahoma, arial;
+}
+.alignleft {
+        float: right;
+}
+.alignright {
+        float: left;
+}
+.subsubsub {
+        float: right;
+}
+.widefat th {
+        text-align: right;
+}
+.widefat th input {
+        margin: 0 8px 0 0;
+}
+.wrap h2 {
+        font-family: arial;
+        padding: 14px 0 3px 15px;
+}
+.wrap h2.long-header {
+        padding-left: 0;
+}
+.updated, .error {
+        clear: both;
+}
+
+.screen-reader-text, .screen-reader-text span {
+        left:auto;
+        text-indent:-1000em;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-admin/css/global-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssiertldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/ie-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,95 +1,95 @@
</span><del>-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-        background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-        background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px;
-}
-* html #adminmenu {
-        margin-left:0;
-        margin-right: -80px;
-}
-* html div.folded #adminmenu {
-        margin-left: 0;
-        margin-right: -22px;
-}
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-        padding: 3px 10px 4px 4px;
-}
-.inline-edit-row fieldset label span.title {
-        float: right;
-}
-.inline-edit-row fieldset label span.input-text-wrap {
-        margin-right: 0;
-}
-p.search-box {
-        float: left;
-}
-* html #poststuff h2 {
-        margin-right: 0;
-}
-#bh {
-        margin: 7px 10px 0 0;
-        float: left;
-}
-#user_info + div#favorite-actions {
-        right: auto;
-        left: 15px;
-}
-#wphead-info {
-        float: left;
-}
-/* without this dashboard widgets appear in one column for some screen widths */
-div#dashboard-widgets {
-        padding-right: 0;
-        padding-left: 1px;
-}
-.tagchecklist span a {
-        margin: 4px -9px 0 0;
-}
-.widefat th input {
-        margin: 0 5px 0 0;
-}
-/* ---------- add by navid */
-#TB_window {
-        width: 670px;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        margin-right: 335px !important;
-}
-#dashboard_plugins {
-        direction: ltr;
-}
-#dashboard_plugins h3.hndle {
-        direction: rtl;
-}
-#dashboard_incoming_links ul li,
-#dashboard_secondary ul li,
-#dashboard_primary ul li,
-p.row-actions {
-        width: 100%;
-}
-#favorite-inside {
-        position: absolute;
-        right:0;
-}
-#post-status-info {
-        height: 25px;
-}
-#screen-meta {
-        position: static;
-}
-p.submit { /* quick edit and reply in edit-comments.php */
-        height:22px;
-}
-.inner-sidebar { /* fix edit single comment */
-        position: static;
-}
-form#widgets-filter { /* fix widget page */
-        position: static;
-}
-
-* html .meta-box-sortables .postbox .handlediv {
-        background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
-}
</del><ins>+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+        background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+        background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px;
+}
+* html #adminmenu {
+        margin-left:0;
+        margin-right: -80px;
+}
+* html div.folded #adminmenu {
+        margin-left: 0;
+        margin-right: -22px;
+}
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+        padding: 3px 10px 4px 4px;
+}
+.inline-edit-row fieldset label span.title {
+        float: right;
+}
+.inline-edit-row fieldset label span.input-text-wrap {
+        margin-right: 0;
+}
+p.search-box {
+        float: left;
+}
+* html #poststuff h2 {
+        margin-right: 0;
+}
+#bh {
+        margin: 7px 10px 0 0;
+        float: left;
+}
+#user_info + div#favorite-actions {
+        right: auto;
+        left: 15px;
+}
+#wphead-info {
+        float: left;
+}
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+        padding-right: 0;
+        padding-left: 1px;
+}
+.tagchecklist span a {
+        margin: 4px -9px 0 0;
+}
+.widefat th input {
+        margin: 0 5px 0 0;
+}
+/* ---------- add by navid */
+#TB_window {
+        width: 670px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        margin-right: 335px !important;
+}
+#dashboard_plugins {
+        direction: ltr;
+}
+#dashboard_plugins h3.hndle {
+        direction: rtl;
+}
+#dashboard_incoming_links ul li,
+#dashboard_secondary ul li,
+#dashboard_primary ul li,
+p.row-actions {
+        width: 100%;
+}
+#favorite-inside {
+        position: absolute;
+        right:0;
+}
+#post-status-info {
+        height: 25px;
+}
+#screen-meta {
+        position: static;
+}
+p.submit { /* quick edit and reply in edit-comments.php */
+        height:22px;
+}
+.inner-sidebar { /* fix edit single comment */
+        position: static;
+}
+form#widgets-filter { /* fix widget page */
+        position: static;
+}
+
+* html .meta-box-sortables .postbox .handlediv {
+        background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/ie-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssiedevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/ie.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,444 +1,444 @@
</span><del>-/* Fixes for IE bugs */
-
-#wpbody-content input.button,
-#wpbody-content input.button-secondary,
-#wpbody-content input.button-highlighted {
-        padding: 2px 3px;
-}
-
-#minor-publishing-actions input,
-#major-publishing-actions input {
-        min-width: auto;
-        padding-left: 0;
-        padding-right: 0;
-}
-
-#wpbody-content .postbox {
-        border: 1px solid #dfdfdf;
-}
-
-#wpbody-content .postbox h3 {
-        margin-bottom: -1px;
-}
-
-* html .meta-box-sortables .postbox .handlediv {
-        background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
-}
-
-* html .edit-box {
-        display: inline;
-}
-
-* html .inner-sidebar #side-sortables,
-* html .postbox-container .meta-box-sortables {
-        height: 300px;
-}
-
-* html #wpbody-content #screen-options-link-wrap {
-        display: inline-block;
-        width: 150px;
-        text-align: center;
-}
-
-* html #wpbody-content #contextual-help-link-wrap {
-        display: inline-block;
-        width: 100px;
-        text-align: center;
-}
-
-* html #adminmenu {
-        margin-left: -80px;
-}
-
-* html .folded #adminmenu {
-        margin-left: -22px;
-}
-
-* html #wpcontent #adminmenu li.menu-top {
-        display: inline;
-        padding: 0;
-        margin: 0;
-}
-
-* html #footer {
-        margin: 0;
-}
-
-.folded #adminmenu li.menu-top {
-        display: block;
-        zoom: 100%;
-}
-
-ul#adminmenu {
-        z-index: 99;
-}
-
-#adminmenu li.menu-top a.menu-top {
-        min-width: auto;
-        width: auto;
-}
-
-#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
-        font-style: normal;
-}
-
-* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
-        background: none;
-}
-
-* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
-        background: url(../images/menu-bits.gif) no-repeat scroll left -109px;
-}
-
-* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
-        background: url(../images/menu-bits.gif) no-repeat scroll left -206px;
-}
-
-* html #adminmenu div.wp-menu-image {
-        height: 29px;
-}
-
-#wpcontent #adminmenu .wp-submenu li {
-        padding: 0;
-}
-
-#adminmenu,
-.wp-submenu,
-.wp-submenu li,
-.wp-menu-toggle {
-        zoom: 100%;
-}
-
-.folded #adminmenu li.wp-menu-separator {
-        width: 28px;
-}
-
-#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
-        padding: 3px 4px 4px 10px;
-        zoom: 100%;
-}
-
-.folded #adminmenu .menu-top {
-        height: 30px;
-}
-
-.folded #adminmenu .wp-submenu {
-        margin: -1px 0 0 0;
-}
-
-#template,
-#template div,
-#editcat,
-#addcat,
-* html .stuffbox h3 {
-        zoom: 100%;
-}
-
-.submitbox {
-        margin-top: 10px;
-}
-
-/* Inline Editor */
-#wpbody-content .quick-edit-row-post .inline-edit-col-left {
-        width: 39%;
-}
-
-#wpbody-content .inline-edit-row-post .inline-edit-col-center {
-        width: 19%;
-}
-
-#wpbody-content .quick-edit-row-page .inline-edit-col-left {
-        width: 49%;
-}
-
-#wpbody-content .bulk-edit-row .inline-edit-col-left {
-        width: 29%;
-}
-
-.inline-edit-row p.submit {
-        zoom: 100%;
-}
-
-.inline-edit-row fieldset label span.title {
-        display: block;
-        float: left;
-        width: 5em;
-}
-
-.inline-edit-row fieldset label span.input-text-wrap {
-        margin-left: 0;
-        zoom: 100%;
-}
-
-#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
-        line-height: 130%;
-}
-
-#wpbody-content .inline-edit-row .input-text-wrap input {
-        width: 95%;
-}
-
-#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input {
-        width: 8em;
-}
-/* end Inline Editor */
-
-input {
-        line-height: 1;
-}
-
-* html .row-actions {
-        visibility: visible;
-}
-
-#dashboard-widgets h3 a {
-        height: 20px;
-        line-height: 20px;
-}
-
-#wphead-info {
-        float: right;
-}
-
-#titlediv #title {
-        width: 98%;
-}
-
-a.button {
-        line-height: 1.4em;
-        margin: 1px;
-        padding: 2px 6px;
-}
-
-* html div.widget-liquid-left,
-* html div.widget-liquid-right {
-        display: block;
-        position: relative;
-}
-
-#screen-options-wrap {
-        overflow: hidden;
-}
-
-#favorite-actions {
-        z-index: 12;
-}
-
-#favorite-inside,
-#favorite-inside a,
-.favorite-action {
-        zoom: 100%;
-}
-
-#the-comment-list .comment-item,
-#post-status-info,
-#wpwrap,
-#wpcontent,
-#wrap,
-#postdivrich,
-#postdiv,
-#poststuff,
-.metabox-holder,
-#titlediv,
-#post-body,
-#editorcontainer,
-.tablenav,
-.widget-liquid-left,
-.widget-liquid-right,
-#widgets-left,
-.widgets-sortables,
-#dragHelper,
-.widget .widget-top,
-.widget,
-.widget-control-actions,
-.tagchecklist,
-#col-container,
-#col-left,
-#col-right,
-.fileedit-sub {
-        display: block;
-        zoom: 100%;
-}
-
-p.search-box {
-        position: static;
-        float: right;
-        margin: -3px 0 4px;
-}
-
-* html #editorcontainer {
-        padding: 0;
-}
-
-#editorcontainer #content {
-        overflow: auto;
-        margin: auto;
-        width: 98%;
-}
-
-form#template div {
-        width: 100%;
-}
-
-#ed_toolbar input,
-#ed_reply_toolbar input {
-        overflow: visible;
-        padding: 0 4px;
-}
-
-#poststuff h2 {
-        font-size: 1.6em;
-}
-
-* html #poststuff h2 {
-        margin-left: 0;
-}
-
-#bh {
-        margin: 7px 10px 0 0;
-        float: right;
-}
-
-/* without this dashboard widgets appear in one column for some screen widths */
-div#dashboard-widgets {
-        padding-right: 1px;
-}
-
-.tagchecklist span, .tagchecklist span a {
-        display: inline-block;
-        display: block;
-}
-
-.tagchecklist span a {
-        margin: 4px 0 0 -9px;
-}
-
-.tablenav .button-secondary, .nav .button-secondary {
-        padding: 0 1px;
-        vertical-align: middle;
-}
-
-.tablenav select {
-        font-size: 13px;
-        display: inline-block;
-        vertical-align: top;
-        margin-top: 2px;
-}
-
-.tablenav .actions select {
-        width: 155px;
-}
-
-table.ie-fixed {
-        table-layout: fixed;
-}
-
-.widefat tr, .widefat th {
-        margin-bottom: 0;
-        border-spacing: 0;
-}
-
-.widefat th input {
-        margin: 0 0 0 5px;
-}
-
-.widefat .check-column {
-        padding: 6px 0 2px;
-}
-
-.widefat tbody th.check-column {
-        padding: 4px 0 22px;
-}
-
-.widefat {
-        empty-cells: show;
-        border-collapse: collapse;
-}
-
-.tablenav a.button-secondary {
-        display: inline-block;
-        padding: 2px 5px;
-}
-
-* html .stuffbox,
-* html .stuffbox input,
-* html .stuffbox textarea {
-        border: 1px solid #DFDFDF;
-}
-
-* html .feature-filter .feature-group li {
-        width: 145px;
-}
-
-* html .widget-top .widget-title-action a {
-        background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
-}
-
-* html div.widget-liquid-left {
-        width: 99%;
-}
-
-#wp_inactive_widgets {
-        padding-bottom: 8px;
-}
-
-* html .widgets-sortables {
-        height: 50px;
-}
-
-* html a#content_resize {
-        right: -2px;
-}
-
-* html .widget-title h4 {
-        width: 205px;
-}
-
-* html #removing-widget .in-widget-title {
-        display: none;
-}
-
-#available-widgets .widget-holder {
-        padding-bottom: 65px;
-}
-
-#widgets-left .inactive {
-        padding-bottom: 10px;
-}
-
-.widget-liquid-right .widget,
-#wp_inactive_widgets .widget {
-        position: relative;
-}
-
-* html .media-item .pinkynail {
-        height: 32px;
-        width: 40px;
-}
-
-#wpcontent .button-primary-disabled {
-        color: #9FD0D5;
-        background: #298CBA;
-}
-
-#wpcontent #ajax-loading {
-        vertical-align: baseline;
-}
-
-* html .describe .field input.text,
-* html .describe .field textarea {
-        width: 440px;
-}
-
-#the-comment-list .unapproved tr,
-#the-comment-list .unapproved td {
-        background-color: #ffffe0;
-}
-
-.imgedit-submit {
-        width: 300px;
-}
-
-* html input {
-        border: 1px solid #dfdfdf;
-}
</del><ins>+/* Fixes for IE bugs */
+
+#wpbody-content input.button,
+#wpbody-content input.button-secondary,
+#wpbody-content input.button-highlighted {
+        padding: 2px 3px;
+}
+
+#minor-publishing-actions input,
+#major-publishing-actions input {
+        min-width: auto;
+        padding-left: 0;
+        padding-right: 0;
+}
+
+#wpbody-content .postbox {
+        border: 1px solid #dfdfdf;
+}
+
+#wpbody-content .postbox h3 {
+        margin-bottom: -1px;
+}
+
+* html .meta-box-sortables .postbox .handlediv {
+        background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
+}
+
+* html .edit-box {
+        display: inline;
+}
+
+* html .inner-sidebar #side-sortables,
+* html .postbox-container .meta-box-sortables {
+        height: 300px;
+}
+
+* html #wpbody-content #screen-options-link-wrap {
+        display: inline-block;
+        width: 150px;
+        text-align: center;
+}
+
+* html #wpbody-content #contextual-help-link-wrap {
+        display: inline-block;
+        width: 100px;
+        text-align: center;
+}
+
+* html #adminmenu {
+        margin-left: -80px;
+}
+
+* html .folded #adminmenu {
+        margin-left: -22px;
+}
+
+* html #wpcontent #adminmenu li.menu-top {
+        display: inline;
+        padding: 0;
+        margin: 0;
+}
+
+* html #footer {
+        margin: 0;
+}
+
+.folded #adminmenu li.menu-top {
+        display: block;
+        zoom: 100%;
+}
+
+ul#adminmenu {
+        z-index: 99;
+}
+
+#adminmenu li.menu-top a.menu-top {
+        min-width: auto;
+        width: auto;
+}
+
+#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu {
+        font-style: normal;
+}
+
+* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle {
+        background: none;
+}
+
+* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle {
+        background: url(../images/menu-bits.gif) no-repeat scroll left -109px;
+}
+
+* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle {
+        background: url(../images/menu-bits.gif) no-repeat scroll left -206px;
+}
+
+* html #adminmenu div.wp-menu-image {
+        height: 29px;
+}
+
+#wpcontent #adminmenu .wp-submenu li {
+        padding: 0;
+}
+
+#adminmenu,
+.wp-submenu,
+.wp-submenu li,
+.wp-menu-toggle {
+        zoom: 100%;
+}
+
+.folded #adminmenu li.wp-menu-separator {
+        width: 28px;
+}
+
+#wpcontent #adminmenu .wp-submenu li.wp-submenu-head {
+        padding: 3px 4px 4px 10px;
+        zoom: 100%;
+}
+
+.folded #adminmenu .menu-top {
+        height: 30px;
+}
+
+.folded #adminmenu .wp-submenu {
+        margin: -1px 0 0 0;
+}
+
+#template,
+#template div,
+#editcat,
+#addcat,
+* html .stuffbox h3 {
+        zoom: 100%;
+}
+
+.submitbox {
+        margin-top: 10px;
+}
+
+/* Inline Editor */
+#wpbody-content .quick-edit-row-post .inline-edit-col-left {
+        width: 39%;
+}
+
+#wpbody-content .inline-edit-row-post .inline-edit-col-center {
+        width: 19%;
+}
+
+#wpbody-content .quick-edit-row-page .inline-edit-col-left {
+        width: 49%;
+}
+
+#wpbody-content .bulk-edit-row .inline-edit-col-left {
+        width: 29%;
+}
+
+.inline-edit-row p.submit {
+        zoom: 100%;
+}
+
+.inline-edit-row fieldset label span.title {
+        display: block;
+        float: left;
+        width: 5em;
+}
+
+.inline-edit-row fieldset label span.input-text-wrap {
+        margin-left: 0;
+        zoom: 100%;
+}
+
+#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input {
+        line-height: 130%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input {
+        width: 95%;
+}
+
+#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input {
+        width: 8em;
+}
+/* end Inline Editor */
+
+input {
+        line-height: 1;
+}
+
+* html .row-actions {
+        visibility: visible;
+}
+
+#dashboard-widgets h3 a {
+        height: 20px;
+        line-height: 20px;
+}
+
+#wphead-info {
+        float: right;
+}
+
+#titlediv #title {
+        width: 98%;
+}
+
+a.button {
+        line-height: 1.4em;
+        margin: 1px;
+        padding: 2px 6px;
+}
+
+* html div.widget-liquid-left,
+* html div.widget-liquid-right {
+        display: block;
+        position: relative;
+}
+
+#screen-options-wrap {
+        overflow: hidden;
+}
+
+#favorite-actions {
+        z-index: 12;
+}
+
+#favorite-inside,
+#favorite-inside a,
+.favorite-action {
+        zoom: 100%;
+}
+
+#the-comment-list .comment-item,
+#post-status-info,
+#wpwrap,
+#wpcontent,
+#wrap,
+#postdivrich,
+#postdiv,
+#poststuff,
+.metabox-holder,
+#titlediv,
+#post-body,
+#editorcontainer,
+.tablenav,
+.widget-liquid-left,
+.widget-liquid-right,
+#widgets-left,
+.widgets-sortables,
+#dragHelper,
+.widget .widget-top,
+.widget,
+.widget-control-actions,
+.tagchecklist,
+#col-container,
+#col-left,
+#col-right,
+.fileedit-sub {
+        display: block;
+        zoom: 100%;
+}
+
+p.search-box {
+        position: static;
+        float: right;
+        margin: -3px 0 4px;
+}
+
+* html #editorcontainer {
+        padding: 0;
+}
+
+#editorcontainer #content {
+        overflow: auto;
+        margin: auto;
+        width: 98%;
+}
+
+form#template div {
+        width: 100%;
+}
+
+#ed_toolbar input,
+#ed_reply_toolbar input {
+        overflow: visible;
+        padding: 0 4px;
+}
+
+#poststuff h2 {
+        font-size: 1.6em;
+}
+
+* html #poststuff h2 {
+        margin-left: 0;
+}
+
+#bh {
+        margin: 7px 10px 0 0;
+        float: right;
+}
+
+/* without this dashboard widgets appear in one column for some screen widths */
+div#dashboard-widgets {
+        padding-right: 1px;
+}
+
+.tagchecklist span, .tagchecklist span a {
+        display: inline-block;
+        display: block;
+}
+
+.tagchecklist span a {
+        margin: 4px 0 0 -9px;
+}
+
+.tablenav .button-secondary, .nav .button-secondary {
+        padding: 0 1px;
+        vertical-align: middle;
+}
+
+.tablenav select {
+        font-size: 13px;
+        display: inline-block;
+        vertical-align: top;
+        margin-top: 2px;
+}
+
+.tablenav .actions select {
+        width: 155px;
+}
+
+table.ie-fixed {
+        table-layout: fixed;
+}
+
+.widefat tr, .widefat th {
+        margin-bottom: 0;
+        border-spacing: 0;
+}
+
+.widefat th input {
+        margin: 0 0 0 5px;
+}
+
+.widefat .check-column {
+        padding: 6px 0 2px;
+}
+
+.widefat tbody th.check-column {
+        padding: 4px 0 22px;
+}
+
+.widefat {
+        empty-cells: show;
+        border-collapse: collapse;
+}
+
+.tablenav a.button-secondary {
+        display: inline-block;
+        padding: 2px 5px;
+}
+
+* html .stuffbox,
+* html .stuffbox input,
+* html .stuffbox textarea {
+        border: 1px solid #DFDFDF;
+}
+
+* html .feature-filter .feature-group li {
+        width: 145px;
+}
+
+* html .widget-top .widget-title-action a {
+        background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
+}
+
+* html div.widget-liquid-left {
+        width: 99%;
+}
+
+#wp_inactive_widgets {
+        padding-bottom: 8px;
+}
+
+* html .widgets-sortables {
+        height: 50px;
+}
+
+* html a#content_resize {
+        right: -2px;
+}
+
+* html .widget-title h4 {
+        width: 205px;
+}
+
+* html #removing-widget .in-widget-title {
+        display: none;
+}
+
+#available-widgets .widget-holder {
+        padding-bottom: 65px;
+}
+
+#widgets-left .inactive {
+        padding-bottom: 10px;
+}
+
+.widget-liquid-right .widget,
+#wp_inactive_widgets .widget {
+        position: relative;
+}
+
+* html .media-item .pinkynail {
+        height: 32px;
+        width: 40px;
+}
+
+#wpcontent .button-primary-disabled {
+        color: #9FD0D5;
+        background: #298CBA;
+}
+
+#wpcontent #ajax-loading {
+        vertical-align: baseline;
+}
+
+* html .describe .field input.text,
+* html .describe .field textarea {
+        width: 440px;
+}
+
+#the-comment-list .unapproved tr,
+#the-comment-list .unapproved td {
+        background-color: #ffffe0;
+}
+
+.imgedit-submit {
+        width: 300px;
+}
+
+* html input {
+        border: 1px solid #dfdfdf;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/ie.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssinstallrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/install-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,16 +1,16 @@
</span><del>-body {
-        font-family: Tahoma, arial;
-}
-h1 {
-        font-family: arial;
-        margin: 5px -4px 0 0;
-}
-ul, ol { padding: 5px 22px 5px 5px; }
-.step, th { text-align: right; }
-.submit input, .button, .button-secondary {
-        font-family: Tahoma, arial;
-        margin-right:0;
-}
-.form-table th {
-        text-align: right;
-}
</del><ins>+body {
+        font-family: Tahoma, arial;
+}
+h1 {
+        font-family: arial;
+        margin: 5px -4px 0 0;
+}
+ul, ol { padding: 5px 22px 5px 5px; }
+.step, th { text-align: right; }
+.submit input, .button, .button-secondary {
+        font-family: Tahoma, arial;
+        margin-right:0;
+}
+.form-table th {
+        text-align: right;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/install-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssloginrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/login-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/login-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/login-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,30 +1,30 @@
</span><del>-body {
-        font-family: Tahoma, arial;
-}
-form {
-        margin-right: 8px;
-        margin-left: 0;
-}
-form .forgetmenot {
-        float: right;
-}
-#login form .submit input {
-        font-family: Tahoma, arial;
-}
-form .submit { float: left; }
-#backtoblog a {
-        left: auto;
-        right: 15px;
-}
-#login_error, .message {
-        margin: 0 8px 16px 0;
-}
-#nav { margin: 0 8px 0 0; }
-#user_pass, #user_login, #user_email {
-        margin-left: 6px;
-        margin-right: 0;
-        direction:ltr;
-}
-h1 a {
-        text-decoration: none;
-}
</del><ins>+body {
+        font-family: Tahoma, arial;
+}
+form {
+        margin-right: 8px;
+        margin-left: 0;
+}
+form .forgetmenot {
+        float: right;
+}
+#login form .submit input {
+        font-family: Tahoma, arial;
+}
+form .submit { float: left; }
+#backtoblog a {
+        left: auto;
+        right: 15px;
+}
+#login_error, .message {
+        margin: 0 8px 16px 0;
+}
+#nav { margin: 0 8px 0 0; }
+#user_pass, #user_login, #user_email {
+        margin-left: 6px;
+        margin-right: 0;
+        direction:ltr;
+}
+h1 a {
+        text-decoration: none;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/login-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssmediartldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/media-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/media-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/media-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,85 +1,85 @@
</span><del>-body#media-upload ul#sidemenu {
-        left: auto;
-        right: 0;
-}
-#search-filter {
-        text-align: left;
-}
-/* specific to the image upload form */
-.align .field label {
-        padding: 0 28px 0 0;
-        margin: 0 0 0 1em;
-}
-.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
-        background-position: center right;
-}
-tr.image-size div.image-size-item {
-        float: right;
-}
-tr.image-size label {
-        margin: 0 1em 0 0;
-}
-.filename.original {
-        float: right;
-}
-.crunching {
-        text-align: left;
-        margin-right: 0;
-        margin-left: 5px;
-}
-button.dismiss {
-        right: auto;
-        left: 5px;
-}
-.file-error {
-        margin: 0 50px 5px 0;
-}
-.progress {
-        left: auto;
-        right: 0;
-}
-.describe td {
-        padding: 0 0 0 5px;
-}
-.bar {
-        border-right-width: 0;
-        border-left-width: 3px;
-        border-right-style: none;
-        border-left-style: solid;
-}
-
-/* Specific to Uploader */
-#media-upload .media-upload-form p {
-        margin: 0 0 1em 1em;
-}
-.filename {
-        float: right;
-        margin-left: 0;
-        margin-right: 10px;
-}
-#media-upload .describe th.label {
-        text-align: right;
-}
-.menu_order {
-        float: left;
-}
-.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
-        font-family: Tahoma, Arial;
-}
-#gallery-settings #basic th.label {
-        padding: 5px 0 5px 5px;
-}
-#gallery-settings .title, h3.media-title {
-        font-family: Tahoma, Arial;
-}
-#gallery-settings .describe th.label {
-        text-align: right;
-}
-#gallery-settings label,
-#gallery-settings legend {
-        margin-right: 0;
-        margin-left: 15px;
-}
-#gallery-settings .align .field label {
-        margin: 0 0 0 1.5em;
-}
</del><ins>+body#media-upload ul#sidemenu {
+        left: auto;
+        right: 0;
+}
+#search-filter {
+        text-align: left;
+}
+/* specific to the image upload form */
+.align .field label {
+        padding: 0 28px 0 0;
+        margin: 0 0 0 1em;
+}
+.image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label {
+        background-position: center right;
+}
+tr.image-size div.image-size-item {
+        float: right;
+}
+tr.image-size label {
+        margin: 0 1em 0 0;
+}
+.filename.original {
+        float: right;
+}
+.crunching {
+        text-align: left;
+        margin-right: 0;
+        margin-left: 5px;
+}
+button.dismiss {
+        right: auto;
+        left: 5px;
+}
+.file-error {
+        margin: 0 50px 5px 0;
+}
+.progress {
+        left: auto;
+        right: 0;
+}
+.describe td {
+        padding: 0 0 0 5px;
+}
+.bar {
+        border-right-width: 0;
+        border-left-width: 3px;
+        border-right-style: none;
+        border-left-style: solid;
+}
+
+/* Specific to Uploader */
+#media-upload .media-upload-form p {
+        margin: 0 0 1em 1em;
+}
+.filename {
+        float: right;
+        margin-left: 0;
+        margin-right: 10px;
+}
+#media-upload .describe th.label {
+        text-align: right;
+}
+.menu_order {
+        float: left;
+}
+.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help {
+        font-family: Tahoma, Arial;
+}
+#gallery-settings #basic th.label {
+        padding: 5px 0 5px 5px;
+}
+#gallery-settings .title, h3.media-title {
+        font-family: Tahoma, Arial;
+}
+#gallery-settings .describe th.label {
+        text-align: right;
+}
+#gallery-settings label,
+#gallery-settings legend {
+        margin-right: 0;
+        margin-left: 15px;
+}
+#gallery-settings .align .field label {
+        margin: 0 0 0 1.5em;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/media-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssplugininstallrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/plugin-install-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/plugin-install-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/plugin-install-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,43 +1,43 @@
</span><del>-div.star {
-        left: auto;
-        right: 0;
-        letter-spacing: 0;
-}
-.star img, div.star a, div.star a:hover, div.star a:visited {
-        right: auto;
-        left: 0;
-}
-#plugin-information ul#sidemenu {
-        left: auto;
-        right: 0;
-}
-#plugin-information h2 {
-        margin-right: 0;
-        margin-left: 200px;
-}
-#plugin-information .fyi {
-        margin-left: 5px;
-        margin-right: 20px;
-}
-#plugin-information .fyi h2 {
-        margin-left: 0;
-}
-#plugin-information .fyi ul {
-        padding: 10px 7px 10px 5px;
-}
-#plugin-information #section-screenshots li p {
-        padding-left: 0;
-        padding-right: 20px;
-}
-#plugin-information .updated,
-#plugin-information pre {
-        margin-right: 0;
-        margin-left: 215px;
-}
-#plugin-information .updated, #plugin-information .error {
-        clear: none;
-        direction: rtl;
-}
-#section-description {
-        direction: ltr;
-}
</del><ins>+div.star {
+        left: auto;
+        right: 0;
+        letter-spacing: 0;
+}
+.star img, div.star a, div.star a:hover, div.star a:visited {
+        right: auto;
+        left: 0;
+}
+#plugin-information ul#sidemenu {
+        left: auto;
+        right: 0;
+}
+#plugin-information h2 {
+        margin-right: 0;
+        margin-left: 200px;
+}
+#plugin-information .fyi {
+        margin-left: 5px;
+        margin-right: 20px;
+}
+#plugin-information .fyi h2 {
+        margin-left: 0;
+}
+#plugin-information .fyi ul {
+        padding: 10px 7px 10px 5px;
+}
+#plugin-information #section-screenshots li p {
+        padding-left: 0;
+        padding-right: 20px;
+}
+#plugin-information .updated,
+#plugin-information pre {
+        margin-right: 0;
+        margin-left: 215px;
+}
+#plugin-information .updated, #plugin-information .error {
+        clear: none;
+        direction: rtl;
+}
+#section-description {
+        direction: ltr;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/plugin-install-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincsspressthisrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/press-this-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/press-this-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,128 +1,128 @@
</span><del>-body {
-        font-family: Tahoma, Arial;
-}
-
-#poststuff #edButtonPreview,
-#poststuff #edButtonHTML {
-        margin: 0 0 0 5px;
-        float: right;
-}
-
-/* Editor/Main Column */
-div#poststuff {
-        padding-left: 0;
-        padding-right: 10px;
-}
-
-.posting {
-        margin-right: 0;
-        margin-left: 228px;
-        left: auto;
-        right: 0;
-}
-
-#side-info-column {
-        float: left;
-        right: auto;
-        left: 0;
-        margin-right: 0;
-        margin-left: 10px;
-}
-
-#side-info-column .sleeve {
-        padding-left: 0;
-        padding-right: 10px;
-}
-
-h3.tb {
-        margin-left: 0;
-        margin-right: 5px;
-}
-
-#actions {
-        float: left;
-}
-
-#extra_fields #actions {
-        right: auto;
-        left: 4px;
-}
-
-#actions li {
-        float: right;
-        margin-right: 0;
-        margin-left: 10px;
-}
-
-#extra_fields .button {
-        margin-right: 0;
-        margin-left: 5px;
-}
-
-/* Photo Styles */
-#img_container a {
-        float: right;
-}
-
-#category-add input, #category-add select {
-        font-family: Tahoma, Arial;
-}
-
-#categorydiv ul.categorychecklist ul {
-        margin-left: 0;
-        margin-right: 18px;
-}
-
-/* Tags */
-#tagsdiv #newtag {
-        margin-right: 0;
-        margin-left: 5px;
-}
-
-#tagadd {
-        margin-left: 0;
-        margin-right: 3px;
-}
-
-#tagchecklist span {
-        margin-left: .5em;
-        margin-right: 10px;
-        float: right;
-}
-#tagchecklist span a {
-        margin: 6px -9px 0 0;
-        float: right;
-}
-
-#content {
-        margin-left: 0;
-        margin-right: 1%;
-}
-
-.submit input,
-.button,
-.button-primary,
-.button-secondary,
-.button-highlighted,
-#postcustomstuff .submit input {
-        font-family: Tahoma, Arial, sans-serif;
-}
-
-.ac_results li {
-        text-align: right;
-}
-
-#TB_ajaxContent #options {
-        right: auto;
-        left: 25px;
-}
-
-#post_status {
-        margin-left: 0;
-        margin-right: 10px;
-}
-
-/* Footer */
-#footer {
-        padding: 10px 60px 0 0;
-}
</del><ins>+body {
+        font-family: Tahoma, Arial;
+}
+
+#poststuff #edButtonPreview,
+#poststuff #edButtonHTML {
+        margin: 0 0 0 5px;
+        float: right;
+}
+
+/* Editor/Main Column */
+div#poststuff {
+        padding-left: 0;
+        padding-right: 10px;
+}
+
+.posting {
+        margin-right: 0;
+        margin-left: 228px;
+        left: auto;
+        right: 0;
+}
+
+#side-info-column {
+        float: left;
+        right: auto;
+        left: 0;
+        margin-right: 0;
+        margin-left: 10px;
+}
+
+#side-info-column .sleeve {
+        padding-left: 0;
+        padding-right: 10px;
+}
+
+h3.tb {
+        margin-left: 0;
+        margin-right: 5px;
+}
+
+#actions {
+        float: left;
+}
+
+#extra_fields #actions {
+        right: auto;
+        left: 4px;
+}
+
+#actions li {
+        float: right;
+        margin-right: 0;
+        margin-left: 10px;
+}
+
+#extra_fields .button {
+        margin-right: 0;
+        margin-left: 5px;
+}
+
+/* Photo Styles */
+#img_container a {
+        float: right;
+}
+
+#category-add input, #category-add select {
+        font-family: Tahoma, Arial;
+}
+
+#categorydiv ul.categorychecklist ul {
+        margin-left: 0;
+        margin-right: 18px;
+}
+
+/* Tags */
+#tagsdiv #newtag {
+        margin-right: 0;
+        margin-left: 5px;
+}
+
+#tagadd {
+        margin-left: 0;
+        margin-right: 3px;
+}
+
+#tagchecklist span {
+        margin-left: .5em;
+        margin-right: 10px;
+        float: right;
+}
+#tagchecklist span a {
+        margin: 6px -9px 0 0;
+        float: right;
+}
+
+#content {
+        margin-left: 0;
+        margin-right: 1%;
+}
+
+.submit input,
+.button,
+.button-primary,
+.button-secondary,
+.button-highlighted,
+#postcustomstuff .submit input {
+        font-family: Tahoma, Arial, sans-serif;
+}
+
+.ac_results li {
+        text-align: right;
+}
+
+#TB_ajaxContent #options {
+        right: auto;
+        left: 25px;
+}
+
+#post_status {
+        margin-left: 0;
+        margin-right: 10px;
+}
+
+/* Footer */
+#footer {
+        padding: 10px 60px 0 0;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/press-this-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincssthemeeditorrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/theme-editor-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/theme-editor-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/theme-editor-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-#templateside {
-        float: left;
-}
</del><ins>+#templateside {
+        float: left;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/theme-editor-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmincsswidgetsrtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/widgets-rtl.dev.css (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/widgets-rtl.dev.css        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/css/widgets-rtl.dev.css        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><del>-ul#widget-list li.widget-list-item div.widget-description {
-        margin: 0 200px 0 0;
-        padding: 0 4em 0 0;
-}
-.widget-control-save,
-.widget-control-remove {
-        margin-right: 0;
-        margin-left: 8px;
-        float: right;
-}
</del><ins>+ul#widget-list li.widget-list-item div.widget-description {
+        margin: 0 200px 0 0;
+        padding: 0 4em 0 0;
+}
+.widget-control-save,
+.widget-control-remove {
+        margin-right: 0;
+        margin-left: 8px;
+        float: right;
+}
</ins><span class="cx">Property changes on: trunk/wp-admin/css/widgets-rtl.dev.css
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminincludeshtaccessms"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/includes/htaccess.ms</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminincludeswpconfigms"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/wp-config.ms (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/wp-config.ms        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-admin/includes/wp-config.ms        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,116 +1,116 @@
</span><del>-<?php
-/**
- * The base configuration of WordPress.
- *
- * This file has the following configurations: MySQL settings, Table Prefix,
- * Secret Keys, WordPress Language, and ABSPATH. You can find more information by
- * visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
- * wp-config.php} Codex page. You can get the MySQL settings from your web host.
- *
- * This file is used by the wp-config.php creation script during the
- * installation.
- *
- * @package WordPress
- */
-
-// ** MySQL settings - You can get this info from your web host ** //
-/** The name of the database for WordPress */
-define('DB_NAME', 'wordpress');
-
-/** MySQL database username */
-define('DB_USER', 'username');
-
-/** MySQL database password */
-define('DB_PASSWORD', 'password');
-
-/** MySQL hostname */
-define('DB_HOST', 'localhost');
-
-/** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
-
-/** The Database Collate type. Don't change this if in doubt. */
-define('DB_COLLATE', '');
-
-/** Network settings - added by the network settings installer */
-define('MULTISITE', true);
-define('VHOST', 'VHOSTSETTING');
-$base = 'BASE';
-define('DOMAIN_CURRENT_SITE', 'current_site_domain' );
-define('PATH_CURRENT_SITE', 'current_site_path' );
-define('SITE_ID_CURRENT_SITE', 1);
-define('BLOGID_CURRENT_SITE', '1' );
-
-/* Uncomment to allow blog admins to edit their users. See http://trac.mu.wordpress.org/ticket/1169 */
-//define( "EDIT_ANY_USER", true );
-/* Uncomment to enable post by email options. See http://trac.mu.wordpress.org/ticket/1084 */
-//define( "POST_BY_EMAIL", true );
-
-/**#@+
- * Authentication Unique Keys.
- *
- * Change these to different unique phrases!
- * You can generate these using the {@link http://api.wordpress.org/secret-key/1.1/wpmu/salt WordPress.org secret-key service}
- * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
- *
- * @since 2.6.0
- */
-define('AUTH_KEY', 'put your unique phrase here');
-define('SECURE_AUTH_KEY', 'put your unique phrase here');
-define('LOGGED_IN_KEY', 'put your unique phrase here');
-define('NONCE_KEY', 'put your unique phrase here');
-define('AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT', 'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-/**#@-*/
-
-/**
- * WordPress Database Table prefix.
- *
- * You can have multiple installations in one database if you give each a unique
- * prefix. Only numbers, letters, and underscores please!
- */
-$table_prefix = 'wp_';
-
-/**
- * WordPress Localized Language, defaults to English.
- *
- * Change this to localize WordPress. A corresponding MO file for the chosen
- * language must be installed to wp-content/languages. For example, install
- * de.mo to wp-content/languages and set WPLANG to 'de' to enable German
- * language support.
- */
-define ('WPLANG', '');
-
-// double check $base
-if( $base == 'BASE' )
-        die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );
-
-// uncomment this to enable WP_CONTENT_DIR/sunrise.php support
-//define( 'SUNRISE', 'on' );
-
-// uncomment to move wp-content/blogs.dir to another relative path
-// remember to change WP_CONTENT too.
-// define( "UPLOADBLOGSDIR", "fileserver" );
-
-// If VHOST is 'yes' uncomment and set this to a URL to redirect if a blog does not exist or is a 404 on the main blog. (Useful if signup is disabled)
-// For example, the browser will redirect to http://examples.com/ for the following: define( 'NOBLOGREDIRECT', 'http://example.com/' );
-// Set this value to %siteurl% to redirect to the root of the site
-// define( 'NOBLOGREDIRECT', '' );
-// On a directory based install you must use the theme 404 handler.
-
-// Location of mu-plugins
-// define( 'WPMU_PLUGIN_DIR', '' );
-// define( 'WPMU_PLUGIN_URL', '' );
-// define( 'MUPLUGINDIR', 'wp-content/mu-plugins' );
-
-define( "WP_USE_MULTIPLE_DB", false );
-
-/* That's all, stop editing! Happy blogging. */
-
-/** Absolute path to the WordPress directory. */
-if ( !defined('ABSPATH') )
-        define('ABSPATH', dirname(__FILE__) . '/');
-
-/** Sets up WordPress vars and included files. */
-require_once(ABSPATH . 'wp-settings.php');
</del><ins>+<?php
+/**
+ * The base configuration of WordPress.
+ *
+ * This file has the following configurations: MySQL settings, Table Prefix,
+ * Secret Keys, WordPress Language, and ABSPATH. You can find more information by
+ * visiting {@link http://codex.wordpress.org/Editing_wp-config.php Editing
+ * wp-config.php} Codex page. You can get the MySQL settings from your web host.
+ *
+ * This file is used by the wp-config.php creation script during the
+ * installation.
+ *
+ * @package WordPress
+ */
+
+// ** MySQL settings - You can get this info from your web host ** //
+/** The name of the database for WordPress */
+define('DB_NAME', 'wordpress');
+
+/** MySQL database username */
+define('DB_USER', 'username');
+
+/** MySQL database password */
+define('DB_PASSWORD', 'password');
+
+/** MySQL hostname */
+define('DB_HOST', 'localhost');
+
+/** Database Charset to use in creating database tables. */
+define('DB_CHARSET', 'utf8');
+
+/** The Database Collate type. Don't change this if in doubt. */
+define('DB_COLLATE', '');
+
+/** Network settings - added by the network settings installer */
+define('MULTISITE', true);
+define('VHOST', 'VHOSTSETTING');
+$base = 'BASE';
+define('DOMAIN_CURRENT_SITE', 'current_site_domain' );
+define('PATH_CURRENT_SITE', 'current_site_path' );
+define('SITE_ID_CURRENT_SITE', 1);
+define('BLOGID_CURRENT_SITE', '1' );
+
+/* Uncomment to allow blog admins to edit their users. See http://trac.mu.wordpress.org/ticket/1169 */
+//define( "EDIT_ANY_USER", true );
+/* Uncomment to enable post by email options. See http://trac.mu.wordpress.org/ticket/1084 */
+//define( "POST_BY_EMAIL", true );
+
+/**#@+
+ * Authentication Unique Keys.
+ *
+ * Change these to different unique phrases!
+ * You can generate these using the {@link http://api.wordpress.org/secret-key/1.1/wpmu/salt WordPress.org secret-key service}
+ * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
+ *
+ * @since 2.6.0
+ */
+define('AUTH_KEY', 'put your unique phrase here');
+define('SECURE_AUTH_KEY', 'put your unique phrase here');
+define('LOGGED_IN_KEY', 'put your unique phrase here');
+define('NONCE_KEY', 'put your unique phrase here');
+define('AUTH_SALT', 'put your unique phrase here');
+define('LOGGED_IN_SALT', 'put your unique phrase here');
+define('SECURE_AUTH_SALT', 'put your unique phrase here');
+/**#@-*/
+
+/**
+ * WordPress Database Table prefix.
+ *
+ * You can have multiple installations in one database if you give each a unique
+ * prefix. Only numbers, letters, and underscores please!
+ */
+$table_prefix = 'wp_';
+
+/**
+ * WordPress Localized Language, defaults to English.
+ *
+ * Change this to localize WordPress. A corresponding MO file for the chosen
+ * language must be installed to wp-content/languages. For example, install
+ * de.mo to wp-content/languages and set WPLANG to 'de' to enable German
+ * language support.
+ */
+define ('WPLANG', '');
+
+// double check $base
+if( $base == 'BASE' )
+        die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );
+
+// uncomment this to enable WP_CONTENT_DIR/sunrise.php support
+//define( 'SUNRISE', 'on' );
+
+// uncomment to move wp-content/blogs.dir to another relative path
+// remember to change WP_CONTENT too.
+// define( "UPLOADBLOGSDIR", "fileserver" );
+
+// If VHOST is 'yes' uncomment and set this to a URL to redirect if a blog does not exist or is a 404 on the main blog. (Useful if signup is disabled)
+// For example, the browser will redirect to http://examples.com/ for the following: define( 'NOBLOGREDIRECT', 'http://example.com/' );
+// Set this value to %siteurl% to redirect to the root of the site
+// define( 'NOBLOGREDIRECT', '' );
+// On a directory based install you must use the theme 404 handler.
+
+// Location of mu-plugins
+// define( 'WPMU_PLUGIN_DIR', '' );
+// define( 'WPMU_PLUGIN_URL', '' );
+// define( 'MUPLUGINDIR', 'wp-content/mu-plugins' );
+
+define( "WP_USE_MULTIPLE_DB", false );
+
+/* That's all, stop editing! Happy blogging. */
+
+/** Absolute path to the WordPress directory. */
+if ( !defined('ABSPATH') )
+        define('ABSPATH', dirname(__FILE__) . '/');
+
+/** Sets up WordPress vars and included files. */
+require_once(ABSPATH . 'wp-settings.php');
</ins><span class="cx">Property changes on: trunk/wp-admin/includes/wp-config.ms
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpcontentblogsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-content/blogs.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-content/themes/twentyten/loop.php        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,127 +1,127 @@
</span><del>-<?php if ( $wp_query->max_num_pages > 1 ) { ?>
-        <div id="nav-above" class="navigation">
-                <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-        </div><!-- #nav-above -->
-<?php } ?>
-
-<?php if ( ! have_posts() ) : ?>
-        <div id="post-0" class="post error404 not-found">
-                <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
-                <div class="entry-content">
-                        <p><?php _e( 'Apologies, but no results were found for the requested Archive. Perhaps searching will help find a related post.', 'twentyten' ); ?></p>
-                        <?php get_search_form(); ?>
-                </div><!-- .entry-content -->
-        </div><!-- #post-0 -->
-<?php endif; ?>
-
-<?php while ( have_posts() ) : the_post(); ?>
-<?php if ( in_category( 'Gallery' ) ) { ?>
-        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                <div class="entry-meta">
-                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                        <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
-                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                </div><!-- .entry-meta -->
-
-                <div class="entry-content">
-                        <div class="gallery-thumb">
-                                <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
-                                $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
-                                $total_images = count($images);
-                                $image = array_shift($images);
-                                echo wp_get_attachment_image( $image->ID, 'thumbnail' );
-                                ?></a>
-                        </div>
-                        <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
-
-                        <?php the_excerpt( '' ); ?>
-                </div><!-- .entry-content -->
-
-                <div class="entry-utility">
-                        <?php
-                                $category_id = get_cat_ID( 'Gallery' );
-                                $category_link = get_category_link( $category_id );
-                        ?>
-                        <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
-                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                </div><!-- #entry-utility -->
-        </div>
-
-
-<?php } elseif ( in_category( 'asides' ) ) { ?>
-        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
-                <div class="entry-summary">
-                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                </div><!-- .entry-summary -->
-<?php else : ?>
-                <div class="entry-content">
-                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                </div><!-- .entry-content -->
-<?php endif; ?>
-
-                <div class="entry-utility">
-                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
-                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                        <span class="meta-sep"> <?php _e( ' by ', 'twentyten' ); ?> </span>
-                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                </div><!-- #entry-utility -->
-        </div><!-- #post-<?php the_ID(); ?> -->
-
-
-<?php } else { ?>
-        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-
-                <div class="entry-meta">
-                        <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
-                        <a href="<?php
-the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
-                        <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
-                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
-                </div><!-- .entry-meta -->
-
-<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
-                <div class="entry-summary">
-                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                </div><!-- .entry-summary -->
-<?php else : ?>
-                <div class="entry-content">
-                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-                        <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
-                </div><!-- .entry-content -->
-<?php endif; ?>
-
-                <div class="entry-utility">
-                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
-                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-                        <?php $tags_text = twentyten_tag_list(); ?>
-                        <?php if ( !empty($tags_text) ) : ?>
-                        <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
-                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
-                        <?php endif; //$tags_text ?>
-                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
-                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
-                </div><!-- #entry-utility -->
-        </div><!-- #post-<?php the_ID(); ?> -->
-
-        <?php comments_template( '', true ); ?>
-
-<?php } ?>
-<?php endwhile; ?>
-
-<?php if ( $wp_query->max_num_pages > 1 ) { ?>
-                                <div id="nav-below" class="navigation">
-                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
-                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
-                                </div><!-- #nav-below -->
</del><ins>+<?php if ( $wp_query->max_num_pages > 1 ) { ?>
+        <div id="nav-above" class="navigation">
+                <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+                <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
+        </div><!-- #nav-above -->
+<?php } ?>
+
+<?php if ( ! have_posts() ) : ?>
+        <div id="post-0" class="post error404 not-found">
+                <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
+                <div class="entry-content">
+                        <p><?php _e( 'Apologies, but no results were found for the requested Archive. Perhaps searching will help find a related post.', 'twentyten' ); ?></p>
+                        <?php get_search_form(); ?>
+                </div><!-- .entry-content -->
+        </div><!-- #post-0 -->
+<?php endif; ?>
+
+<?php while ( have_posts() ) : the_post(); ?>
+<?php if ( in_category( 'Gallery' ) ) { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+
+                <div class="entry-meta">
+                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                </div><!-- .entry-meta -->
+
+                <div class="entry-content">
+                        <div class="gallery-thumb">
+                                <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
+                                $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
+                                $total_images = count($images);
+                                $image = array_shift($images);
+                                echo wp_get_attachment_image( $image->ID, 'thumbnail' );
+                                ?></a>
+                        </div>
+                        <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
+
+                        <?php the_excerpt( '' ); ?>
+                </div><!-- .entry-content -->
+
+                <div class="entry-utility">
+                        <?php
+                                $category_id = get_cat_ID( 'Gallery' );
+                                $category_link = get_category_link( $category_id );
+                        ?>
+                        <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
+                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div>
+
+
+<?php } elseif ( in_category( 'asides' ) ) { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+                <div class="entry-summary">
+                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                </div><!-- .entry-summary -->
+<?php else : ?>
+                <div class="entry-content">
+                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                </div><!-- .entry-content -->
+<?php endif; ?>
+
+                <div class="entry-utility">
+                        <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+                        <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"> <?php _e( ' by ', 'twentyten' ); ?> </span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div><!-- #post-<?php the_ID(); ?> -->
+
+
+<?php } else { ?>
+        <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+                <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
+
+                <div class="entry-meta">
+                        <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
+                        <a href="<?php
+the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+                        <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
+                        <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+                </div><!-- .entry-meta -->
+
+<?php if ( is_archive() || is_search() ) : //Only display Excerpts for archives & search ?>
+                <div class="entry-summary">
+                        <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                </div><!-- .entry-summary -->
+<?php else : ?>
+                <div class="entry-content">
+                        <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+                        <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
+                </div><!-- .entry-content -->
+<?php endif; ?>
+
+                <div class="entry-utility">
+                        <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
+                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+                        <?php $tags_text = twentyten_tag_list(); ?>
+                        <?php if ( !empty($tags_text) ) : ?>
+                        <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
+                        <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+                        <?php endif; //$tags_text ?>
+                        <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+                        <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
+                </div><!-- #entry-utility -->
+        </div><!-- #post-<?php the_ID(); ?> -->
+
+        <?php comments_template( '', true ); ?>
+
+<?php } ?>
+<?php endwhile; ?>
+
+<?php if ( $wp_query->max_num_pages > 1 ) { ?>
+                                <div id="nav-below" class="navigation">
+                                        <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+                                        <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
+                                </div><!-- #nav-below -->
</ins><span class="cx"> <?php } ?>
</span><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-content/themes/twentyten/loop.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenonecolumnpagephp"></a>
<div class="propset"><h4>Property changes: trunk/wp-content/themes/twentyten/onecolumn-page.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmsfilesphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/ms-files.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludespluggabledeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable-deprecated.php (13254 => 13255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable-deprecated.php        2010-02-20 14:07:23 UTC (rev 13254)
+++ trunk/wp-includes/pluggable-deprecated.php        2010-02-20 21:00:19 UTC (rev 13255)
</span><span class="lines">@@ -1,115 +1,115 @@
</span><del>-<?php
-/**
- * Deprecated pluggable functions from past WordPress versions. You shouldn't use these
- * functions and look for the alternatives instead. The functions will be removed in a
- * later version.
- *
- * Deprecated warnings are also thrown if one of these functions is being defined by a plugin.
- *
- * @package WordPress
- * @subpackage Deprecated
- * @see pluggable.php
- */
-
-/*
- * Deprecated functions come here to die.
- */
-
-if ( !function_exists('wp_setcookie') ) :
-/**
- * Sets a cookie for a user who just logged in. This function is deprecated.
- *
- * @since 1.5
- * @deprecated 2.5
- * @deprecated Use wp_set_auth_cookie()
- * @see wp_set_auth_cookie()
- *
- * @param string $username The user's username
- * @param string $password Optional. The user's password
- * @param bool $already_md5 Optional. Whether the password has already been through MD5
- * @param string $home Optional. Will be used instead of COOKIEPATH if set
- * @param string $siteurl Optional. Will be used instead of SITECOOKIEPATH if set
- * @param bool $remember Optional. Remember that the user is logged in
- */
-function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
-        _deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
-        $user = get_userdatabylogin($username);
-        wp_set_auth_cookie($user->ID, $remember);
-}
-else :
-        _deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
-endif;
-
-if ( !function_exists('wp_clearcookie') ) :
-/**
- * Clears the authentication cookie, logging the user out. This function is deprecated.
- *
- * @since 1.5
- * @deprecated 2.5
- * @deprecated Use wp_clear_auth_cookie()
- * @see wp_clear_auth_cookie()
- */
-function wp_clearcookie() {
-        _deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
-        wp_clear_auth_cookie();
-}
-else :
-        _deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
-endif;
-
-if ( !function_exists('wp_get_cookie_login') ):
-/**
- * Gets the user cookie login. This function is deprecated.
- *
- * This function is deprecated and should no longer be extended as it won't be
- * used anywhere in WordPress. Also, plugins shouldn't use it either.
- *
- * @since 2.0.3
- * @deprecated 2.5
- * @deprecated No alternative
- *
- * @return bool Always returns false
- */
-function wp_get_cookie_login() {
-        _deprecated_function( __FUNCTION__, '2.5' );
-        return false;
-}
-else :
-        _deprecated_function( 'wp_get_cookie_login', '2.5' );
-endif;
-
-if ( !function_exists('wp_login') ) :
-/**
- * Checks a users login information and logs them in if it checks out. This function is deprecated.
- *
- * Use the global $error to get the reason why the login failed. If the username
- * is blank, no error will be set, so assume blank username on that case.
- *
- * Plugins extending this function should also provide the global $error and set
- * what the error is, so that those checking the global for why there was a
- * failure can utilize it later.
- *
- * @since 1.2.2
- * @deprecated Use wp_signon()
- * @global string $error Error when false is returned
- *
- * @param string $username User's username
- * @param string $password User's password
- * @param bool $deprecated Not used
- * @return bool False on login failure, true on successful check
- */
-function wp_login($username, $password, $deprecated = '') {
-        _deprecated_function( __FUNCTION__, '2.5', 'wp_signon()' );
-        global $error;
-
-        $user = wp_authenticate($username, $password);
-
-        if ( ! is_wp_error($user) )
-                return true;
-
-        $error = $user->get_error_message();
-        return false;
-}
-else :
-        _deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
</del><ins>+<?php
+/**
+ * Deprecated pluggable functions from past WordPress versions. You shouldn't use these
+ * functions and look for the alternatives instead. The functions will be removed in a
+ * later version.
+ *
+ * Deprecated warnings are also thrown if one of these functions is being defined by a plugin.
+ *
+ * @package WordPress
+ * @subpackage Deprecated
+ * @see pluggable.php
+ */
+
+/*
+ * Deprecated functions come here to die.
+ */
+
+if ( !function_exists('wp_setcookie') ) :
+/**
+ * Sets a cookie for a user who just logged in. This function is deprecated.
+ *
+ * @since 1.5
+ * @deprecated 2.5
+ * @deprecated Use wp_set_auth_cookie()
+ * @see wp_set_auth_cookie()
+ *
+ * @param string $username The user's username
+ * @param string $password Optional. The user's password
+ * @param bool $already_md5 Optional. Whether the password has already been through MD5
+ * @param string $home Optional. Will be used instead of COOKIEPATH if set
+ * @param string $siteurl Optional. Will be used instead of SITECOOKIEPATH if set
+ * @param bool $remember Optional. Remember that the user is logged in
+ */
+function wp_setcookie($username, $password = '', $already_md5 = false, $home = '', $siteurl = '', $remember = false) {
+        _deprecated_function( __FUNCTION__, '2.5', 'wp_set_auth_cookie()' );
+        $user = get_userdatabylogin($username);
+        wp_set_auth_cookie($user->ID, $remember);
+}
+else :
+        _deprecated_function( 'wp_setcookie', '2.5', 'wp_set_auth_cookie()' );
+endif;
+
+if ( !function_exists('wp_clearcookie') ) :
+/**
+ * Clears the authentication cookie, logging the user out. This function is deprecated.
+ *
+ * @since 1.5
+ * @deprecated 2.5
+ * @deprecated Use wp_clear_auth_cookie()
+ * @see wp_clear_auth_cookie()
+ */
+function wp_clearcookie() {
+        _deprecated_function( __FUNCTION__, '2.5', 'wp_clear_auth_cookie()' );
+        wp_clear_auth_cookie();
+}
+else :
+        _deprecated_function( 'wp_clearcookie', '2.5', 'wp_clear_auth_cookie()' );
+endif;
+
+if ( !function_exists('wp_get_cookie_login') ):
+/**
+ * Gets the user cookie login. This function is deprecated.
+ *
+ * This function is deprecated and should no longer be extended as it won't be
+ * used anywhere in WordPress. Also, plugins shouldn't use it either.
+ *
+ * @since 2.0.3
+ * @deprecated 2.5
+ * @deprecated No alternative
+ *
+ * @return bool Always returns false
+ */
+function wp_get_cookie_login() {
+        _deprecated_function( __FUNCTION__, '2.5' );
+        return false;
+}
+else :
+        _deprecated_function( 'wp_get_cookie_login', '2.5' );
+endif;
+
+if ( !function_exists('wp_login') ) :
+/**
+ * Checks a users login information and logs them in if it checks out. This function is deprecated.
+ *
+ * Use the global $error to get the reason why the login failed. If the username
+ * is blank, no error will be set, so assume blank username on that case.
+ *
+ * Plugins extending this function should also provide the global $error and set
+ * what the error is, so that those checking the global for why there was a
+ * failure can utilize it later.
+ *
+ * @since 1.2.2
+ * @deprecated Use wp_signon()
+ * @global string $error Error when false is returned
+ *
+ * @param string $username User's username
+ * @param string $password User's password
+ * @param bool $deprecated Not used
+ * @return bool False on login failure, true on successful check
+ */
+function wp_login($username, $password, $deprecated = '') {
+        _deprecated_function( __FUNCTION__, '2.5', 'wp_signon()' );
+        global $error;
+
+        $user = wp_authenticate($username, $password);
+
+        if ( ! is_wp_error($user) )
+                return true;
+
+        $error = $user->get_error_message();
+        return false;
+}
+else :
+        _deprecated_function( 'wp_login', '2.5', 'wp_signon()' );
</ins><span class="cx"> endif;
</span><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/wp-includes/pluggable-deprecated.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre>
</div>
</div>
</body>
</html>