<!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" />
<title>[35508] trunk/src: Adjust heading structure for pages using wp-admin/css/install.css</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35508">35508</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35508","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-04 17:59:35 +0000 (Wed, 04 Nov 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Adjust heading structure for pages using wp-admin/css/install.css
The readme, installation, upgrade, and repair pages use a common css file. The heading structure for these pages was inconstant with h2s where there should be h1s, h1s where there is no relevant info and sometimes, no h1s at all.
Fixes <a href="https://core.trac.wordpress.org/ticket/34519">#34519</a>
Props rianrietveld</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcreadmehtml">trunk/src/readme.html</a></li>
<li><a href="#trunksrcwpadmincssinstallcss">trunk/src/wp-admin/css/install.css</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcreadmehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/readme.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/readme.html 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/readme.html 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,11 +13,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p style="text-align: center">Semantic Personal Publishing Platform</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>First Things First</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>First Things First</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p style="text-align: right">— Matt Mullenweg</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Installation: Famous 5-minute install</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Installation: Famous 5-minute install</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Unzip the package in an empty directory and upload everything.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,15 +32,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on “Profile” to change the password.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Updating</h1>
-<h2>Using the Automatic Updater</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Updating</h2>
+<h3>Using the Automatic Updater</h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>You wanted more, perhaps? That’s it!</li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2>Updating Manually</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h3>Updating Manually</h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Delete your old WordPress files, saving ones you’ve modified.</li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,16 +48,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ol>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Migrating from other systems</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Migrating from other systems</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>WordPress can <a href="https://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>System Requirements</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>System Requirements</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="http://php.net/">PHP</a> version <strong>5.2.4</strong> or higher.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2>Recommendations</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h3>Recommendations</h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="http://php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.5</strong> or higher.</li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Online Resources</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Online Resources</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:</p>
</span><span class="cx" style="display: block; padding: 0 10px"> <dl>
</span><span class="cx" style="display: block; padding: 0 10px"> <dt><a href="https://codex.wordpress.org/">The WordPress Codex</a></dt>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,18 +80,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
</span><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Final Notes</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Final Notes</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/">Support Forums</a>.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn’t modify any of the core code.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>Share the Love</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>Share the Love</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/cafélog</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1>License</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2>License</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span></span></pre></div>
<a id="trunksrcwpadmincssinstallcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/install.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/install.css 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/wp-admin/css/install.css 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: #5b9dd9 solid 1px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-h1 {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+h1, h2 {
</ins><span class="cx" style="display: block; padding: 0 10px"> border-bottom: 1px solid #dedede;
</span><span class="cx" style="display: block; padding: 0 10px"> clear: both;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: normal;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-h2 {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+h3 {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 16px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> #logo {
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 6px 0 14px 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0 0 7px 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> border-bottom: none;
</span><span class="cx" style="display: block; padding: 0 10px"> text-align:center
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/wp-admin/install.php 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,8 +16,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <title>Error: PHP is not running</title>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="wp-core-ui">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 id="logo"><a href="https://wordpress.org/">WordPress</a></h1>
- <h2>Error: PHP is not running</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p id="logo"><a href="https://wordpress.org/">WordPress</a></p>
+ <h1>Error: PHP is not running</h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="wp-core-ui<?php echo $body_classes ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } // end display_header()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,6 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_null( $error ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="message"><?php echo $error; ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1><?php _e( 'Information needed' ); ?></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h2><?php _e( 'Information needed' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please provide the following information. Don’t worry, you can always change these settings later.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminmaintrepairphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/maint/repair.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/maint/repair.php 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/wp-admin/maint/repair.php 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,11 +22,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="wp-core-ui">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo '<h1 class="screen-reader-text">' . __( 'Allow automatic repair database' ) . '</h1>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $default_key = 'put your unique phrase here';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,11 +55,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $duplicated_keys = array_filter( $duplicated_keys );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $duplicated_keys || $missing_key ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Translators: 1: wp-config.php; 2: Secret key service URL.
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['repair'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo '<h1 class="screen-reader-text">' . __( 'Results database repair' ) . '</h1>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $optimize = 2 == $_GET['repair'];
</span><span class="cx" style="display: block; padding: 0 10px"> $okay = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $problems = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,6 +146,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/wp-admin/setup-config.php 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_admin_css( 'install', true ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="<?php echo implode( ' ', $body_classes ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } // end function setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,6 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case -1:
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header( 'language-chooser' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<h1 class="screen-reader-text">Select a default language</h1>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<form id="setup" method="post" action="?step=0">';
</span><span class="cx" style="display: block; padding: 0 10px"> wp_install_language_form( $languages );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</form>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $step_1 .= '&language=' . $loaded_language;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <ol>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php _e( 'Database name' ); ?></li>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,6 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1 class="screen-reader-text"><?php _e( 'Setup your database connection' ) ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <form method="post" action="setup-config.php?step=2">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( "Below you should enter your database connection details. If you’re not sure about these, contact your host." ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,6 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $path_to_wp_config, 0666 );
</span><span class="cx" style="display: block; padding: 0 10px"> setup_config_display_header();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( "All right, sparky! You’ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to…" ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2015-11-04 17:53:40 UTC (rev 35507)
+++ trunk/src/wp-admin/upgrade.php 2015-11-04 17:59:35 UTC (rev 35508)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,11 +67,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body class="wp-core-ui">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2><?php _e( 'No Update Required' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1><?php _e( 'No Update Required' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $goback = urlencode( $goback );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2><?php _e( 'Database Update Required' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1><?php _e( 'Database Update Required' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $backto = esc_url( $backto );
</span><span class="cx" style="display: block; padding: 0 10px"> $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<h2><?php _e( 'Update Complete' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<h1><?php _e( 'Update Complete' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>