Commit Graph

18 Commits

Author SHA1 Message Date
Andrew Nacin 217c37b516 Have wp_upload_dir() account for blog switching, ms-files rewriting, and the UPLOADS constant properly. This type of logic needs a lot of code comments.
Prevents wp_upload_dir() from obeying the UPLOADS constant when ms-files rewriting is enabled and a blog is switched.

Reverts [22106] thanks to [22108].

see #19235.



git-svn-id: https://develop.svn.wordpress.org/trunk@22222 602fd350-edb4-49c9-b593-d223f7449a82
2012-10-12 22:05:02 +00:00
Andrew Nacin 5358b13ae3 Account for the old 'main override' in wp_upload_dir() for the main site in a post-MU network by declining to define the UPLOADS constant.
Fixes uploads on the main site of a post-MU network that uses ms-files rewriting. see #19235.



git-svn-id: https://develop.svn.wordpress.org/trunk@21892 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-18 18:07:18 +00:00
Andrew Nacin 930d3b2a99 Attach the default ms_files_rewriting site option filter in ms-default-constants, as ms-default-filters is not included during SHORTINIT. see #19235.
git-svn-id: https://develop.svn.wordpress.org/trunk@21881 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-17 22:05:06 +00:00
Andrew Nacin 7f29924c6a Remove ms-files.php rewriting from WordPress multisite. fixes #19235.
Keep existing networks compatible with a ms_files_rewriting network option.



git-svn-id: https://develop.svn.wordpress.org/trunk@21823 602fd350-edb4-49c9-b593-d223f7449a82
2012-09-11 22:22:20 +00:00
Ryan Boren 2b186b0c45 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: https://develop.svn.wordpress.org/trunk@19712 602fd350-edb4-49c9-b593-d223f7449a82
2012-01-08 17:01:11 +00:00
Ryan Boren aec821c651 Strip trailing whitespace
git-svn-id: https://develop.svn.wordpress.org/trunk@14924 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-26 02:42:15 +00:00
Andrew Nacin 42e9ce36fc Deprecate VHOST in favor of a boolean, SUBDOMAIN_INSTALL. Core will keep VHOST defined for plugins' sake, but you should only define SUBDOMAIN_INSTALL. Throws a notice if VHOST is defined, and a warning if they somehow conflict. Sunrise can still handle them. fixes #11796.
git-svn-id: https://develop.svn.wordpress.org/trunk@14452 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-04 20:48:28 +00:00
Ron Rennick 2c1b847219 only use domain cookies in a subdomain install, see #12142
git-svn-id: https://develop.svn.wordpress.org/trunk@14380 602fd350-edb4-49c9-b593-d223f7449a82
2010-05-03 18:53:05 +00:00
Andrew Nacin 5bf79d1d8e File-level phpdoc for multisite files.
git-svn-id: https://develop.svn.wordpress.org/trunk@13998 602fd350-edb4-49c9-b593-d223f7449a82
2010-04-04 13:29:35 +00:00
Ron Rennick 2f1c39ad75 fix warning on cookie_domain, see #12457
git-svn-id: https://develop.svn.wordpress.org/trunk@13707 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-15 17:43:18 +00:00
Ron Rennick 59fe0e60fa Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558
git-svn-id: https://develop.svn.wordpress.org/trunk@13632 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 18:19:28 +00:00
Andrew Nacin 91b380571d Allow localhost in a multisite subdirectory install. More network.php improvements. see #12457 for localhost. see #11816
git-svn-id: https://develop.svn.wordpress.org/trunk@13622 602fd350-edb4-49c9-b593-d223f7449a82
2010-03-09 06:14:42 +00:00
Ryan Boren f24e88359e Trim trailing whites
git-svn-id: https://develop.svn.wordpress.org/trunk@13268 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-21 00:03:42 +00:00
Ron Rennick 0a4e820ba1 use current site domain for cookie domain when cookie domain not set, See #12142
git-svn-id: https://develop.svn.wordpress.org/trunk@13127 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-14 00:12:08 +00:00
Peter Westwood 2b3837f55a Improve the implementation of the default constant defining functions for multisite. See #11881.
git-svn-id: https://develop.svn.wordpress.org/trunk@13065 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-12 08:22:34 +00:00
Ron Rennick 012732f59d improvements to custom content dir support, props nacin, see #11742
git-svn-id: https://develop.svn.wordpress.org/trunk@12936 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-03 18:19:56 +00:00
Ron Rennick e1a54f07b8 reorganize code on ms startup. props nacin, see #11644
git-svn-id: https://develop.svn.wordpress.org/trunk@12921 602fd350-edb4-49c9-b593-d223f7449a82
2010-02-01 20:26:08 +00:00
Ryan Boren 3dac74e345 Add ms-default-constants.php. Props nacin. see #11881
git-svn-id: https://develop.svn.wordpress.org/trunk@12886 602fd350-edb4-49c9-b593-d223f7449a82
2010-01-28 17:16:58 +00:00