← Back to branch summary

~canonical-sysadmins/wordpress/4.8.1

« back to all changes in this revision

Viewing changes to wp-admin/includes/network.php

  • Committer: Barry Price
  • Date: 2016-08-17 04:50:12 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: barry.price@canonical.com-20160817045012-qfui81zhqnqv2ba9
Merge WP4.6 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/network.php
52
52
function allow_subdirectory_install() {
53
53
        global $wpdb;
54
54
        /**
55
 
         * Filter whether to enable the subdirectory install feature in Multisite.
 
55
         * Filters whether to enable the subdirectory install feature in Multisite.
56
56
         *
57
57
         * @since 3.0.0
58
58
         *
159
159
                $subdomain_install = true;
160
160
        } else {
161
161
                $subdomain_install = false;
162
 
                if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions 
 
162
                if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions
163
163
                        echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
164
164
                        /* translators: %s: mod_rewrite */
165
165
                        printf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
180
180
                        /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
181
181
                        printf( __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
182
182
                                '<code>mod_rewrite</code>',
183
 
                                'http://httpd.apache.org/docs/mod/mod_rewrite.html',
184
 
                                'http://www.google.com/search?q=apache+mod_rewrite'
 
183
                                'https://httpd.apache.org/docs/mod/mod_rewrite.html',
 
184
                                'https://www.google.com/search?q=apache+mod_rewrite'
185
185
                        );
186
186
                        echo '</p></div>';
187
187
                }
405
405
?>
406
406
                <ol>
407
407
                        <li><p><?php printf(
408
 
                                /* translators: 1: wp-config.php 2: location of wp-config file */
409
 
                                __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ),
 
408
                                /* translators: 1: wp-config.php 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
 
409
                                __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
410
410
                                '<code>wp-config.php</code>',
411
 
                                '<code>' . $location_of_wp_config . '</code>'
 
411
                                '<code>' . $location_of_wp_config . '</code>',
 
412
                                /*
 
413
                                 * translators: This string should only be translated if wp-config-sample.php is localized.
 
414
                                 * You can check the localized release package or
 
415
                                 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
 
416
                                 */
 
417
                                '<code>/* ' . __( 'That&#8217;s all, stop editing! Happy blogging.' ) . ' */</code>'
412
418
                        ); ?></p>
413
419
                                <textarea class="code" readonly="readonly" cols="100" rows="7">
414
420
define('MULTISITE', true);
578
584
                <p><?php _e( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.' ); ?> <a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log In' ); ?></a></p>
579
585
<?php
580
586
        }
581
 
}
 
 
b'\\ No newline at end of file'
 
587
}