Ticket #26879: 26879-7.patch
File 26879-7.patch, 11.4 KB (added by , 11 years ago) |
---|
-
wp-admin/css/install.css
7 7 background: #fff; 8 8 color: #555; 9 9 font-family: "Open Sans", sans-serif; 10 margin: 140px auto 25px;11 padding: 20px 20px 10px 20px;10 margin: 8em auto; 11 padding: 1em 2em; 12 12 max-width: 700px; 13 13 -webkit-font-smoothing: subpixel-antialiased; 14 14 -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13); … … 187 187 188 188 #error-page code, .code { 189 189 font-family: Consolas, Monaco, monospace; 190 background: aliceblue; 190 191 } 191 192 192 193 #pass-strength-result { -
wp-admin/css/login.css
53 53 .login form { 54 54 margin-top: 20px; 55 55 margin-left: 0; 56 padding: 26px 24px 46px;56 padding: 19px 24px 25px 24px; 57 57 font-weight: normal; 58 58 overflow: hidden; 59 59 background: #fff; -
wp-admin/setup-config.php
116 116 setup_config_display_header(); 117 117 ?> 118 118 119 <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> 119 120 <p><?php _e( "To get started, we need some information on the database. This information is available through your web host. If you don't have it, you'll need to get in touch with them. Here's what you need:" ) ?></p> 120 121 <ol> 121 122 <li><?php _e( 'Database name' ); ?></li> 122 123 <li><?php _e( 'Database username' ); ?></li> … … 124 125 <li><?php _e( 'Database host' ); ?></li> 125 126 <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li> 126 127 </ol> 127 <p>< strong><?php _e( "If for any reason this automatic file creation doesn’t work, don’t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong></p>128 <p><?php _e( "I n all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you’re all ready…" ); ?></p>128 <p><?php _e( "Once you fill in this information, WordPress will create a configuration file called wp-config.php. This connects WordPress with your database (that's where your content, settings, photos, and all that good stuff is stored). Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?></p> 129 <p><?php _e( "If you’re all ready…" ); ?></p> 129 130 130 131 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&noapi'; ?>" class="button button-large"><?php _e( 'Let’s go!' ); ?></a></p> 131 132 <?php … … 135 136 setup_config_display_header(); 136 137 ?> 137 138 <form method="post" action="setup-config.php?step=2"> 138 <p><?php _e( "Below you should enter your database connection details. If you’re not sure about these, contact your host." ); ?></p>139 <p><?php _e( "Below you should enter your MySQL database connection details. If you’re not sure about these, contact your host." ); ?></p> 139 140 <table class="form-table"> 140 141 <tr> 141 142 <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th> 142 143 <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td> 143 <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>144 <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td> 144 145 </tr> 145 146 <tr> 146 147 <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th> 147 148 <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td> 148 <td><?php _e( 'Your MySQLusername' ); ?></td>149 <td><?php _e( 'Your database username' ); ?></td> 149 150 </tr> 150 151 <tr> 151 152 <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th> 152 153 <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td> 153 <td><?php _e( '…and your MySQLpassword.' ); ?></td>154 <td><?php _e( '…and your database password.' ); ?></td> 154 155 </tr> 155 156 <tr> 156 157 <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th> … … 175 176 176 177 $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>'; 177 178 178 if ( empty( $prefix ) ) 179 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) ); 180 179 // Validate $prefix: it must not be empty 180 if ( empty( $prefix ) ): 181 $die = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>'; 182 $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field should not be empty. <br /> Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>'; 183 $die .= ( __( $tryagain_link ) ); 184 wp_die( $die, __( 'WordPress › Error' ) ); 185 endif; 186 181 187 // Validate $prefix: it can only contain letters, numbers and underscores. 182 if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) 183 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) ); 188 if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ): 189 $die = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>'; 190 $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can only contain numbers, letters, and underscores. <br />Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>'; 191 $die .= ( __( $tryagain_link ) ); 192 wp_die( $die, __( 'WordPress › Error' ) ); 193 endif; 184 194 185 195 // Test the db connection. 186 196 /**#@+ … … 263 273 if ( ! is_writable(ABSPATH) ) : 264 274 setup_config_display_header(); 265 275 ?> 266 <p><?php _e( "Sorry, but I can’t write the <code>wp-config.php</code> file." ); ?></p> 267 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p> 276 <p><?php _e( 'Please manually create a file called <code>wp-config.php</code> in the root directory where the rest of your WordPress files are located and copy and paste the following text into the file:' ); ?></p> 268 277 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php 269 278 foreach( $config_file as $line ) { 270 279 echo htmlentities($line, ENT_COMPAT, 'UTF-8'); -
wp-includes/functions.php
2206 2206 <style type="text/css"> 2207 2207 html { 2208 2208 background: #eee; 2209 margin: 0 20px; 2209 2210 } 2210 2211 body { 2211 2212 background: #fff; 2212 color: # 333;2213 color: #555; 2213 2214 font-family: "Open Sans", sans-serif; 2214 margin: 2em auto;2215 margin: 8em auto; 2215 2216 padding: 1em 2em; 2216 2217 max-width: 700px; 2218 -webkit-font-smoothing: subpixel-antialiased; 2217 2219 -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13); 2218 2220 box-shadow: 0 1px 3px rgba(0,0,0,0.13); 2219 2221 } … … 2226 2228 padding: 0; 2227 2229 padding-bottom: 7px; 2228 2230 } 2229 #error-page {2230 margin-top: 50px;2231 }2232 2231 #error-page p { 2233 2232 font-size: 14px; 2234 2233 line-height: 1.5; 2235 margin: 25px 0 20px; 2234 padding-bottom: 2px; 2235 /*margin: 25px 0 20px;*/ 2236 2236 } 2237 2237 #error-page code { 2238 2238 font-family: Consolas, Monaco, monospace; 2239 2239 } 2240 #logo { 2241 margin: 6px 0 14px 0; 2242 border-bottom: none; 2243 text-align:center; 2244 } 2245 #logo a { 2246 background-image: url('/wp-admin/images/w-logo-blue.png?ver=20131202'); 2247 background-image: none, url('/wp-admin/images/wordpress-logo.svg?ver=20131107'); 2248 background-size: 80px 80px; 2249 background-position: center top; 2250 background-repeat: no-repeat; 2251 color: #999; 2252 height: 80px; 2253 font-size: 20px; 2254 font-weight: normal; 2255 line-height: 1.3em; 2256 margin: -154px auto 25px; 2257 padding: 0; 2258 text-decoration: none; 2259 width: 80px; 2260 text-indent: -9999px; 2261 outline: none; 2262 overflow: hidden; 2263 display: block; 2264 } 2265 2240 2266 ul li { 2241 2267 margin-bottom: 10px; 2242 2268 font-size: 14px ; -
wp-includes/wp-db.php
903 903 if ( !@mysql_select_db( $db, $dbh ) ) { 904 904 $this->ready = false; 905 905 wp_load_translations_early(); 906 $this->bail( sprintf( __( '<h1>Can’t select database</h1> 906 $this->bail( sprintf( __( '<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1> 907 <h1>Can’t select database</h1> 907 908 <p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p> 908 909 <ul> 909 910 <li>Are you sure it exists?</li> … … 1243 1244 } 1244 1245 1245 1246 $this->bail( sprintf( __( " 1247 <h1 id='logo'><a href='http://wordpress.org/'>WordPress</a></h1> 1246 1248 <h1>Error establishing a database connection</h1> 1247 1249 <p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p> 1248 1250 <ul> -
wp-load.php
53 53 $path = wp_guess_url() . '/wp-admin/setup-config.php'; 54 54 55 55 // Die with an error message 56 $die = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';57 $die .= '< p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';58 $die .= '<p>' . __( " You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';59 $die .= '<p ><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';60 61 wp_die( $die, __( 'WordPress › Error') );56 $die = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>'; 57 $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>'; 58 $die .= '<p>' . __( "WordPress is web software you can use to create a beautiful website, blog, or almost <a href='http://wordpress.org/showcase/'>anything you can imagine</a>. The core software is built by hundreds of community volunteers, and there are thousands of <a href='http://wordpress.org/plugins/'>plugins</a> and <a href='http://wordpress.org/themes/'>themes</a> available to transform your site." ) . '</p>'; 59 $die .= '<p style="text-align: center;">' . __( "We'd love you to join the family." ) . '</p>'; 60 $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>'; 61 wp_die( $die, __( "Welcome to WordPress!" ) ); 62 62 }