Changeset 14825

Timestamp:

05/23/2010 10:19:09 PM (15 years ago)

Author:

nacin

Message:

Show warning in network.php if using a custom wp-content directory. fixes #11742.

File:

• trunk/wp-admin/network.php (modified) (2 diffs)

trunk/wp-admin/network.php

@@ -146 +146 @@
         $error_codes = $errors->get_error_codes();
     }
+
+    if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' )
+        echo '<div class="error"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
 
     $site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) );
@@ -288 +291 @@
 ?>
         <ol>
-            <li><p><?php printf( __( 'Create a <code>blogs.dir</code> directory in <code>%s</code>. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR ); ?></p></li>
+            <li><p><?php
+                printf( __( 'Create a <code>blogs.dir</code> directory in <code>%s</code>. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR );
+                if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' )
+                    echo ' <strong>' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '</strong';
+            ?></p></li>
             <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), ABSPATH ); ?></p>
                 <textarea class="code" readonly="readonly" cols="100" rows="7">