WordPress.org

Make WordPress Core

Opened 2 years ago

Closed 18 months ago

Last modified 6 weeks ago

#19796 closed task (blessed) (fixed)

Multisite installs should work with WordPress in a subdirectory

Reported by: markjaquith Owned by: markjaquith
Milestone: 3.5 Priority: high
Severity: normal Version:
Component: Multisite Keywords: has-patch needs-testing needs-codex
Focuses: Cc:

Description (last modified by ryan)

Currently, Multisite cannot be enabled if WordPress is installed within a subdirectory. This prevents you from using WordPress as an SVN or Git external. We should have parity.

Resolved: find a way to make Multisite work if WordPress is in a subdirectory.

Attachments (23)

19796-hack-day.diff (6.5 KB) - added by markjaquith 21 months ago.
19796-hack-day.2.diff (7.1 KB) - added by evansolomon 21 months ago.
Switch to get_option() and correct the .htaccess install instructions
19796-hack-day.3.diff (8.1 KB) - added by evansolomon 21 months ago.
Add subdirectory base to IIS rewrites
19796-hack-day.4.diff (8.5 KB) - added by markjaquith 21 months ago.
19796-hack-day.5.diff (8.0 KB) - added by markjaquith 21 months ago.
19796-hack-day.6.diff (10.4 KB) - added by johnjamesjacoby 21 months ago.
Includes $base global removal
19796-hack-day.7.diff (10.4 KB) - added by johnjamesjacoby 21 months ago.
Add missing preceding slash to WP_SITEURL_SUBDIR in network.php
19796-hack-day.8.diff (11.0 KB) - added by markjaquith 21 months ago.
19796-hack-day.9.diff (17.7 KB) - added by markjaquith 21 months ago.
19796-hack-day.10.diff (18.1 KB) - added by markjaquith 21 months ago.
19796-hack-day.11.diff (23.3 KB) - added by evansolomon 21 months ago.
19796-hack-day.12.diff (26.8 KB) - added by evansolomon 21 months ago.
Remove unused IIS multisite rewrites from iis7_url_rewrite_rules()
19796-hack-day.13.diff (26.8 KB) - added by duck_ 21 months ago.
19796-hack-day.14.diff (26.8 KB) - added by evansolomon 21 months ago.
19796-hack-day.15.diff (26.9 KB) - added by markjaquith 20 months ago.
Correct path for .htaccess
19796-hack-day.16.diff (26.9 KB) - added by markjaquith 20 months ago.
Also fix path for web.config
19796-hack-day.17.diff (28.3 KB) - added by markjaquith 19 months ago.
19796.diff (26.7 KB) - added by nacin 19 months ago.
Refreshed patch that tries to stick to rewrites to make things work. I think the .htaccess $subdir_match rules are borked, and the technique needs to be tested on Apache 1.3 as well.
19796.2.diff (24.5 KB) - added by markjaquith 19 months ago.
My attempt at merging, which probably failed horribly.
19796.3.diff (23.4 KB) - added by markjaquith 19 months ago.
Refresh, drop the constant.
19796.4.diff (23.5 KB) - added by markjaquith 19 months ago.
Lose the non-capturing regular expression groups.
19796.5.diff (16.2 KB) - added by markjaquith 19 months ago.
Lose the non-capturing regular expression groups.
19796.5.2.diff (16.2 KB) - added by markjaquith 19 months ago.
Lose a lot of cruft. Do the rewrite rule base detection based on ABSPATH, not user-provided URLs.

Download all attachments as: .zip

Change History (109)

comment:1 Ipstenu2 years ago

  • Cc ipstenu@… added

comment:2 flashingcursor2 years ago

  • Cc flashingcursor added

comment:3 follow-up: andrea_r2 years ago

  • Cc andrea@… added

Can you clarify that it's when WordPress is in a folder and the index.php file is moved up a folder?

Because you can enable multisite if the whole install is in a folder, such as for a subdomain. Yes, you can also install it in /whatever/ as long as you're willing to live with that in the address.

You cannot map domains to installs with a foldername in the url though.

comment:4 scribu2 years ago

I could have sworn there was a ticket for this already.

Anyway, glad to see it considered for 3.4.

comment:5 in reply to: ↑ 3 PeteMall2 years ago

Replying to andrea_r:

Can you clarify that it's when WordPress is in a folder and the index.php file is moved up a folder?

Because you can enable multisite if the whole install is in a folder, such as for a subdomain. Yes, you can also install it in /whatever/ as long as you're willing to live with that in the address.

You cannot map domains to installs with a foldername in the url though.

WordPress in a folder ==> site_url != home_url

comment:6 kpdesign2 years ago

  • Cc kparsell-wp@… added

comment:7 DrewAPicture2 years ago

  • Cc xoodrew@… added

comment:8 toscho2 years ago

  • Cc info@… added

comment:9 kawauso2 years ago

  • Cc kawauso added

comment:10 markjaquith2 years ago

  • Description modified (diff)

Taking this out of the description to make it clear that contributions are welcomed from all. We'll call out responsible parties elsewhere.

comment:11 DrewAPicture2 years ago

#12814 seems related

comment:12 tfnab2 years ago

  • Cc martinhh@… added

comment:13 westi2 years ago

  • Cc westi added

comment:14 Japh2 years ago

  • Cc Japh added

comment:15 aaroncampbell2 years ago

  • Cc aaroncampbell added

comment:16 johnjamesjacoby2 years ago

  • Cc johnjamesjacoby added

Note: we use this on BuddyPress.org, Rosetta, and WordCamp.org already.

comment:17 masonjames2 years ago

  • Cc masonjames@… added

comment:18 bigdawggi2 years ago

  • Cc matt@… added

comment:19 ryan2 years ago

  • Description modified (diff)
  • Milestone changed from 3.4 to Future Release

Not happening in 3.4.

comment:20 johnbillion23 months ago

  • Cc johnbillion added

comment:21 prettyboymp23 months ago

  • Cc mpretty@… added

comment:22 jkudish23 months ago

  • Cc joachim.kudish@… added

comment:23 tillkruess23 months ago

  • Cc me@… added

comment:24 devesine22 months ago

  • Cc justin@… added

comment:25 NealMcConachie21 months ago

  • Cc NealMcConachie added

comment:26 rfair40421 months ago

  • Cc rfair404 added

comment:27 jblz21 months ago

  • Cc jblz added

comment:28 wonderboymusic21 months ago

eMusic uses Multisite with WordPress as an external in /wordpress - you can make it work by filtering home/site URLs, you also have to define WP_CONTENT_URL and WP_CONTENT_DIR. Is the issue here that WordPress is supposed to figure this out for you?

comment:29 andrea_r21 months ago

@wonderboymusic the ticket refers to having the WordPress files in a folder off the root, and running the main install as if it were placed in the root. So without the /wordpress/ in the URL.

comment:30 follow-up: wonderboymusic21 months ago

right, we do that, by filtering - so are the tasks for this ticket making that happen automagically?

comment:31 in reply to: ↑ 30 scribu21 months ago

Yes.

comment:32 andrea_r21 months ago

Exactly.

So just to confirm, you run multisite on the public facing side as whatever.com, but it is installed in /wordpress/, and you've moved the root index.php?

This process here:
http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory

comment:33 scribu21 months ago

Sharing your filter-based solution would help to gauge how badly this is needed.

Last edited 21 months ago by scribu (previous) (diff)

comment:34 wonderboymusic21 months ago

  • Keywords has-patch needs-testing added; needs-patch removed

Here are the pieces to making Multisite work in a subdirectory:

1) load files or register external in a subdirectory - let's say "wordpress"
2) move index.php to DOCUMENT_ROOT
3) move wp-config.php to DOCUMENT_ROOT
4) edit .htaccess to internal-redirect ABSPATH files to the proper place

RewriteRule  ^([_0-9a-zA-Z-]+/)?(wp-.*) /wordpress/$2 [L]
RewriteRule  ^([_0-9a-zA-Z-]+/)?(.*\.php)$ /wordpress/$2 [L]

5) Set define( 'WP_CONTENT_DIR' ) if it is different that ABSPATH (if WordPress is in a subdir, it is)
6) Edit index.php to point at /wordpress/wp-blog-header.php instead of ./wp-blog-header.php

items # 1-4 have to happen manually
items # 5-6 can happen automagically in my patch (attaching)

Last edited 21 months ago by wonderboymusic (previous) (diff)

comment:35 markjaquith21 months ago

  • Status changed from new to accepted

Rather thorough attempt that emerged from the WordCamp San Francisco Hack Day. Handles subdir and subdomain multisite installs.

To test, install WP in single site mode in a subdirectory. Move the Site URL ('home') to the root. Set up the Network. Boom.

comment:36 follow-up: markjaquith21 months ago

To do:

  • use get_option( 'home' / 'siteurl' ) instead of home_url() / site_url()
  • Investigate custom content directories
  • IIS

comment:37 evansolomon21 months ago

  • Cc evan@… added

comment:38 in reply to: ↑ 36 evansolomon21 months ago

Replying to markjaquith:

To do:

  • use get_option( 'home' / 'siteurl' ) instead of home_url() / site_url()
  • Investigate custom content directories
  • IIS

Also:

  • Update .htaccess instructions to use the root directory, not ABSPATH

"Add the following to your .htaccess file in /Users/evan/code/wptrunk/wp/"

Should be

"Add the following to your .htaccess file in /Users/evan/code/wptrunk/"

evansolomon21 months ago

Switch to get_option() and correct the .htaccess install instructions

comment:39 evansolomon21 months ago

Done in 19796-hack-day.2.diff :

  • use get_option( 'home' / 'siteurl' ) instead of home_url() / site_url()
  • Update .htaccess instructions to use the root directory, not ABSPATH

Already done (just works):

  • Investigate custom content directories

evansolomon21 months ago

Add subdirectory base to IIS rewrites

comment:40 markjaquith21 months ago

Cleaned up a variable that was used for two different purposes.

comment:41 markjaquith21 months ago

  • Keywords dev-feedback added

This is looking pretty good to me. Let's have a few more eyes on it.

comment:42 scribu21 months ago

This works for subdirectory installs, for the main blog. For other blogs, I need to figure out the nginx rewrite rules.

johnjamesjacoby21 months ago

Includes $base global removal

johnjamesjacoby21 months ago

Add missing preceding slash to WP_SITEURL_SUBDIR in network.php

comment:43 markjaquith21 months ago

.10.diff kills the WP subdirectory from wp-admin URLs. So if WordPress is installed in /wp/install/dir/ you don't get URLs like:

http://foo.example.com/wp/install/dir/wp-admin/ OR
http://example.com/foo/wp/install/dir/wp-admin/

Instead, you get:

http://foo.example.com/wp-admin/ OR
http://example.com/foo/wp-admin/

There are a few niggling issues. The login link after multisite creation isn't correct, and it doesn't clear cookies (you have to do it manually in your browser).

comment:44 markjaquith21 months ago

Oh, it also introduces join_with_slashes(). Pass in arguments, either string or array, and you get back a string with no leading or trailing slashes, and exactly one slash between the concatenated members.

Last edited 21 months ago by markjaquith (previous) (diff)

comment:45 markjaquith21 months ago

IIS rules need to be updated.

comment:46 evansolomon21 months ago

.11.diff brings the following magic:

  • Updates IIS rewrites and refactors them into a single HEREDOC to match Apache's
  • Abstracts join_with_slashes() into join_with_string(), which join_with_slashes() then calls

Note: We decided that the login link after multisite creation is fine. It still includes the subdirectory install path, but it works since login.php doesn't need any rewrites. On login, you get properly redirected and receive a new set of cookies.

It would be great to get this tested by someone with an IIS install.

Last edited 21 months ago by evansolomon (previous) (diff)

comment:47 evansolomon21 months ago

Latest patch also skips defining WP_SITEURL_SUBDIR if you're not actually using a subdirectory install. Ridding WordPress of (new) constants, one at a time.

evansolomon21 months ago

Remove unused IIS multisite rewrites from iis7_url_rewrite_rules()

comment:48 evansolomon21 months ago

.12.diff removed unused multisite rewrites for IIS from iis7_url_rewrite_rules(). These came over in the original multisite merge (r12697) but were are unused because this function is never called when is_multisite() is true.

This makes iis7_url_rewrite_rules()more closely match mod_rewrite_rules(), which is defined just before it and also doesn't provide multisite rules.

props duck_

Last edited 21 months ago by evansolomon (previous) (diff)

duck_21 months ago

comment:49 follow-up: duck_21 months ago

19796-hack-day.13.diff fixes a small problem in join_with_string() where is_array( $parts ) should be is_array( $part ).

I also noticed that there are a few calls to join_with_slashes() that have a slash as one of the arguments. Isn't this useless? The call to trim() will create an empty string out of it.

comment:50 in reply to: ↑ 49 evansolomon21 months ago

Replying to duck_:

19796-hack-day.13.diff fixes a small problem in join_with_string() where is_array( $parts ) should be is_array( $part ).

I also noticed that there are a few calls to join_with_slashes() that have a slash as one of the arguments. Isn't this useless? The call to trim() will create an empty string out of it.

Thanks. Both of these were remnants of intermediate versions of abstracting these functions that I missed when cleaning them up. The slash arguments to join_with_slashes() are removed in .14.diff.

markjaquith20 months ago

Correct path for .htaccess

comment:51 markjaquith20 months ago

.15.diff fixes the path for .htaccess

markjaquith20 months ago

Also fix path for web.config

comment:52 ancawonka20 months ago

  • Cc anca-wp@… added

comment:53 brianlayman20 months ago

Note: This includes the $base/$current_site->path fixes from the patch I attached to #18079 last year. #18079 also suggest some changes to the .htaccess code for multi-network compatibility, however if this ticket goes into the next release, #18079 could be closed as it is largely addressed.

This fixes the multinetwork support lost between 2.9 and 3.0 and enables some featues in the wp-multi-network plugin trunk.

comment:54 brianlayman20 months ago

  • Cc Brian@… added

comment:55 emzo20 months ago

  • Cc emzo added

comment:56 husobj20 months ago

  • Cc ben@… added

comment:57 iandunn20 months ago

  • Cc ian_dunn@… added

comment:58 follow-up: evansolomon20 months ago

The latest patch could really use testing from a real IIS install. Unfortunately (at least in this specific case) I have a Mac without any Windows VM, and don't have any other machines with a Windows install. If there's anyone around a Windows install that could setup a local IIS, it would be very helpful in testing this patch.

comment:59 in reply to: ↑ 58 jblz20 months ago

Replying to evansolomon:

The latest patch could really use testing from a real IIS install.

Clean install & db.. Getting an Internal Server Error 500 with 19796-hack-day.16.diff applied. Trunk works as expected.
Win7 x64 - PHP 5.3.16 - FastCGI

EDIT:
Scratch that -- it was just a permissions problem :-/ Continuing to test

Last edited 20 months ago by jblz (previous) (diff)

comment:60 developdaly20 months ago

  • Cc patrick@… added

comment:61 nacin20 months ago

  • Milestone changed from Future Release to 3.5

comment:62 markjaquith19 months ago

Gonna drop this in unless there are any objections.

comment:63 markjaquith19 months ago

Talked with Nacin some. I think we can lose the constant. We only need it when constructing the rewrite rules, and we can do that by leaving home and siteurl from the main site unequal, as is. When generating the rewrite rules, we subtract home from siteurl, slashy slashy, and we have our relative path.

comment:64 nacin19 months ago

In [21813]:

Use network_site_url() for wp-signup.php. props markjaquith. see #19796.

comment:65 nacin19 months ago

  • Keywords needs-refresh added; dev-feedback removed

Needs a pretty major refresh after [21823], see #19235. As I caused it, it's on me unless someone beats me to it.

Additionally, needs refresh from Mark's comment above.

nacin19 months ago

Refreshed patch that tries to stick to rewrites to make things work. I think the .htaccess $subdir_match rules are borked, and the technique needs to be tested on Apache 1.3 as well.

markjaquith19 months ago

My attempt at merging, which probably failed horribly.

markjaquith19 months ago

Refresh, drop the constant.

markjaquith19 months ago

Lose the non-capturing regular expression groups.

markjaquith19 months ago

Lose the non-capturing regular expression groups.

markjaquith19 months ago

Lose a lot of cruft. Do the rewrite rule base detection based on ABSPATH, not user-provided URLs.

comment:66 markjaquith19 months ago

In [22042]:

Make Multisite work when WordPress is installed in a subdirectory. You can now have WordPress Multisite as an SVN external or a Git submodule! props johnjamesjacoby, evansolomon, duck_, jakemgold, nacin, markjaquith. see #19796

comment:67 evansolomon19 months ago

In addition to adding a cool new feature, we actually removed 98 lines of code here. Awesome.

comment:68 scribu19 months ago

  • Keywords needs-refresh removed

Works like a charm.

comment:69 mordauk19 months ago

  • Cc pippin@… added

comment:70 markjaquith18 months ago

  • Resolution set to fixed
  • Status changed from accepted to closed

Open new tickets for distinct issues!

comment:71 scribu18 months ago

Follow-up: #22235

comment:72 follow-up: budykiller18 months ago

Hello.
I've upgrade to WP 3.5 beta 2 to use your patch but i still can't use Multisite installation in a subdirectory while accessing it from the root URL (avoiding the subdirectory in URL).

Is there anything special to do to get it working ?
Here's my post on WP Support forum :
http://wordpress.org/support/topic/accessing-wordpress-subdirectory-from-root-url
Thank you very much for all your work.
Adrien.

comment:73 in reply to: ↑ 72 scribu18 months ago

Replying to budykiller:

I've upgrade to WP 3.5 beta 2 to use your patch but i still can't use Multisite installation in a subdirectory while accessing it from the root URL (avoiding the subdirectory in URL).

Actually, this ticket is about making it work with the subdirectory in the URL.

Anyway, If anyone is interested in getting this working on nginx, here's what I use: https://gist.github.com/4030509

comment:74 Ipstenu18 months ago

No, this is the install in domain.com/folder, run from domain.com

http://core.trac.wordpress.org/ticket/19796#comment:5

You can already install in domain.com/folder and run from domain.com/folder, but without the running in root, when you do that, you can't map domains.

It worked for me.

comment:75 scribu18 months ago

I'm not sure I follow, Ipstenu. In either case, please take a look at #22235

comment:76 Ipstenu18 months ago

We're talking about this: http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory

And it works fine, the user is doing something wrong ;) Addressing in the forums.

comment:77 follow-up: toderash17 months ago

I have installed 3.5-beta3-22639 on nginx with multisite enabled and wordpress core files in a subdirectory: domain.com/wp/wp-*. Works fine except a minor issue in the nav from the admin bar, where links to any of the *network* admin pages omit the /wp/ subdir. Hacking the url to add the /wp/ subdir yields the correct pages, which then function as expected until a form submission, which then attempts to return without the /wp/ subdir. Other nav links in the admin bar to the root site admin correctly include the /wp/ subdir.

Last edited 17 months ago by toderash (previous) (diff)

comment:78 in reply to: ↑ 77 nacin17 months ago

Replying to toderash:

I have installed 3.5-beta3-22639 on nginx with multisite enabled and wordpress core files in a subdirectory: domain.com/wp/wp-*. Works fine except a minor issue in the nav from the admin bar, where links to any of the *network* admin pages omit the /wp/ subdir. Hacking the url to add the /wp/ subdir yields the correct pages, which then function as expected until a form submission, which then attempts to return without the /wp/ subdir. Other nav links in the admin bar to the root site admin correctly include the /wp/ subdir.

That's actually expected behavior. /wp/ doesn't exist anywhere in the database — only rewrite rules. That's what this ticket ended up being about. So you would continue to go to /wp-admin/ and /wp-admin/network. I think the only case where that wouldn't be true is indeed the main/root site, which would keep /wp/ as before. If you removed /wp/ from siteurl for that site, everything should continue to work as the rewrite rules will handle it. If that isn't the behavior you're seeing, please open a ticket.

comment:79 nacin17 months ago

In 23107:

Use $current_site->path instead of $base in wpmu_validate_blog_signup(), as $base is now dead. props MarkJaquith. fixes #22787. see #19796.

comment:80 follow-up: sil.linguist17 months ago

  • Cc sil.linguist added

Does this work with the sub.domain option or just the sub/directory option? It is helpful to know that it is probably user error... so a reply to: http://wordpress.org/support/topic/redirects-for-mutisite-35-beta3 may be more appropriate than here on Trac.

comment:83 Ipstenu16 months ago

Updated for WP in it's own directory and where images are.

comment:84 Denis-de-Bernardy3 months ago

Stil some issues, discussed in #23221

Last edited 3 months ago by Denis-de-Bernardy (previous) (diff)

comment:85 ircbot2 months ago

This ticket was mentioned in IRC in #wordpress-dev by nacin. View the logs.

comment:86 ircbot6 weeks ago

This ticket was mentioned in IRC in #wordpress-dev by nacin. View the logs.

Note: See TracTickets for help on using tickets.