← Back to branch summary

~ubuntu-branches/debian/jessie/wordpress/jessie

« back to all changes in this revision

Viewing changes to .pc/003installer.patch/wp-admin/install.php

  • Committer: Package Import Robot
  • Author(s): Craig Small
  • Date: 2014-04-17 20:56:19 UTC
  • mfrom: (1.2.35)
  • Revision ID: package-import@ubuntu.com-20140417205619-nurbet6eho4yvwfv
Tags: 3.9+dfsg-1
* New upstream release
* 3.9 seems to handle different locations for plugins so the
  plugin directory handling patches have been cut back.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/003installer.patch/wp-admin/install.php
16
16
        <title>Error: PHP is not running</title>
17
17
</head>
18
18
<body class="wp-core-ui">
19
 
        <h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
 
19
        <h1 id="logo"><a href="https://wordpress.org/">WordPress</a></h1>
20
20
        <h2>Error: PHP is not running</h2>
21
21
        <p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
22
22
</body>
47
47
 * Display install header.
48
48
 *
49
49
 * @since 2.5.0
50
 
 * @package WordPress
51
 
 * @subpackage Installer
52
50
 */
53
51
function display_header() {
54
52
        header( 'Content-Type: text/html; charset=utf-8' );
64
62
        ?>
65
63
</head>
66
64
<body class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>">
67
 
<h1 id="logo"><a href="<?php echo esc_url( __( 'http://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
 
65
<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
68
66
 
69
67
<?php
70
68
} // end display_header()
73
71
 * Display installer setup form.
74
72
 *
75
73
 * @since 2.8.0
76
 
 * @package WordPress
77
 
 * @subpackage Installer
78
74
 */
79
75
function display_setup_form( $error = null ) {
80
76
        global $wpdb;
106
102
                        <?php
107
103
                        if ( $user_table ) {
108
104
                                _e('User(s) already exists.');
 
105
                                echo '<input name="user_name" type="hidden" value="admin" />';
109
106
                        } else {
110
107
                                ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
111
108
                                <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
123
120
                                <input name="admin_password" type="password" id="pass1" size="25" value="" />
124
121
                                <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
125
122
                                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
126
 
                                <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
 
123
                                <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
127
124
                        </td>
128
125
                </tr>
129
126
                <?php endif; ?>
221
218
 
222
219
                if ( $error === false ) {
223
220
                        $wpdb->show_errors();
224
 
                        $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
 
221
                        $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ) );
225
222
                        extract( $result, EXTR_SKIP );
226
223
?>
227
224