sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,720 Commits 2 Branches 473 Tags 137 MiB
29471da7bd
Commit Graph

35 Commits

Author SHA1 Message Date
Ryan Boren
20a1def1c0 switch_to_blog() and restore_current_blog() housekeeping. 
wp-includes/admin-bar.php:

* Replace get_admin_url() and get_home_url() with admin_url() and home_url() and place them inside a switch/restore. Likewise replace current_user_can_for_blog() with current_user_can(). This avoids doing multiple switch restores.

wp-includes/ms-blogs.php:

* Deprecate the $validate argument to switch_to_blog(). This avoids a not very necessary call to get_blog_details(), possibly saving a few queries.
* Use $_wp_switched and $_wp_switched_stack instead of $switched and $switched_stack to make it less likely these globals will be stomped.
* Use GLOBALS to access blog_id and other globals. I've preferred this style lately since it makes it obvious a global is being used and avoids global blog_id being stomped by a local variable.
* Lose some is_object() checks. wp_get_current_user() always returns an object, for example.
* Call the new WP_Roles::reinit() method.

wp-includes/class-wp-xmlrpc-server.php:

* Replace current_user_can_for_blog() with current_user_can() and move it inside the switch/restore pair. This eliminates a switch/restore.

wp-includes/capabilities.php:

* Use array_keys() instead of $role => $data since $data is unused. I *think* this is a bit faster.
* Introduce WP_Roles::reinit(). This reinitializes WP_Roles and is used after switch_to_blog() has already update the blog ID in the wpdb object. If a global roles array is being used instead of the db, reinit is skipped.
* current_user_can_for_blog() now does a switch/restore. It didn't before meaning it could be reinitializing the user with the wrong role information for the current blog.

wp-includes/ms-settings.php:

* Define $_wp_switched_stack and $_wp_switched. This way switch_to_blog() and restore_current_blog() can rely on it being set.

wp-settings.php:

* Instantiate the WP_Roles global. This was it is always defined during init. To remove the WP_Roles checks from WP_Role and WP_User this would probably have to move before plugins are loaded, which might not be a good thing.

wp-includes/functions.php:

* Update wp_upload_dir() to reference _wp_switched.



git-svn-id: https://develop.svn.wordpress.org/trunk@21485 602fd350-edb4-49c9-b593-d223f7449a82
 2012-08-09 16:28:15 +00:00
Andrew Nacin
2fd55c3df1 Introduce wp_load_translations_early(), which can be used before the locale is properly loaded in order to translate early error strings. Internationalize setup-config.php -- translators no longer have a reason to modify this file. fixes #18180. 
git-svn-id: https://develop.svn.wordpress.org/trunk@19760 602fd350-edb4-49c9-b593-d223f7449a82
 2012-01-26 20:34:27 +00:00
Andrew Nacin
1881a56cb5 Remove old $base/BASE MU check. props mdawaffe, fixes #18479. 
git-svn-id: https://develop.svn.wordpress.org/trunk@18568 602fd350-edb4-49c9-b593-d223f7449a82
 2011-08-18 22:27:30 +00:00
Pete Mall
86bc8c04a2 Address redirection loop with multiple networks and network admin. Props mwidmann, fixes #15591 
git-svn-id: https://develop.svn.wordpress.org/trunk@16633 602fd350-edb4-49c9-b593-d223f7449a82
 2010-11-30 20:45:40 +00:00
Ryan Boren
1b7b0e1d7f Unset global variables when they are no longer needed. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15747 602fd350-edb4-49c9-b593-d223f7449a82
 2010-10-07 20:12:49 +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
Andrew Nacin
8800622876 s/blog/site/ in more places. props PeteMall, see #11644. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14313 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-30 01:54:32 +00:00
Dion Hulse
491063c698 Tweak new strings for better typography. Props demetris. Fixes #12962 
git-svn-id: https://develop.svn.wordpress.org/trunk@14070 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-11 10:41:54 +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
Nikolay Bachiyski
7fcffb8d12 Wrap transtable strings used in Network install in WP_I18N_SOMETHING, because translations still aren't loaded. Fixes #12357 
git-svn-id: https://develop.svn.wordpress.org/trunk@13797 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-22 06:51:49 +00:00
Mark Jaquith
8bca8131a6 More pedantry. "Setup" is not a verb. http://notaverb.com/setup 
git-svn-id: https://develop.svn.wordpress.org/trunk@13725 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-17 04:39:50 +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
Andrew Nacin
8995a960b9 Move $base sanity check to from MS config template to ms-settings. see #11816 
git-svn-id: https://develop.svn.wordpress.org/trunk@13610 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-06 19:36:35 +00:00
Ron Rennick
a4399a2db5 remove __( calls from ms startup, see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@13575 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-03 17:13:38 +00:00
Ron Rennick
c02cd1ebc8 always call set_blog_id after blog lookup, See #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@13421 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-26 00:05:11 +00:00
Ron Rennick
fcabf2c9df database code cleanup, See #12362 
git-svn-id: https://develop.svn.wordpress.org/trunk@13387 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-24 21:30:13 +00:00
Ron Rennick
b2e6817220 update wpdb blogid using setter, See #12362 
git-svn-id: https://develop.svn.wordpress.org/trunk@13386 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-24 21:07:23 +00:00
Andrew Nacin
d17afeb98e Minor MS startup cleanups. See #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@13254 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-20 14:07:23 +00:00
Andrew Nacin
8c10673185 Rename is_installed() to ms_not_installed(). See #12083 
git-svn-id: https://develop.svn.wordpress.org/trunk@13253 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-20 13:51:32 +00:00
Ryan Boren
3da1c8bb17 Add ability to query by domain and/or path to get_blog_details(). Improve blog details caching. Use get_blog_details() in ms-settings.php so queries are cached. see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@13126 602fd350-edb4-49c9-b593-d223f7449a82
 2010-02-13 23:09:54 +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
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
1f8632249d Remove db error show/hide, suppress/unsuppress in ms bootstrap. see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@12901 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-29 19:16:07 +00:00
Ryan Boren
bdbf075914 ms-settings cleanup. Props nacin. see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@12896 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-29 16:26:46 +00:00
Ryan Boren
88024e6674 Clean up cache re-init code in Multisite. Props nacin. fixes #12065 
git-svn-id: https://develop.svn.wordpress.org/trunk@12888 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-28 17:28:44 +00:00
Ron Rennick
014f5da245 rearrage multisite initialization, remove deprecated $wpmuBaseTablePrefix, props nacin, see #11881 
git-svn-id: https://develop.svn.wordpress.org/trunk@12885 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-28 16:09:52 +00:00
Ryan Boren
909191a37d Deprecate is_main_blog() for is_main_site(). see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@12858 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-26 22:46:09 +00:00
Ron Rennick
7028f64e49 allow www installs to enable multisite, see #11945 
git-svn-id: https://develop.svn.wordpress.org/trunk@12787 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-21 17:20:23 +00:00
Ryan Boren
59d31d8c5e Formatting cleanups 
git-svn-id: https://develop.svn.wordpress.org/trunk@12760 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-19 17:01:39 +00:00
Ron Rennick
436316a4a8 Add is_subdomain_install() to ms code - Fixes #11796 
git-svn-id: https://develop.svn.wordpress.org/trunk@12674 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-08 21:25:01 +00:00
Ryan Boren
18e6d905c5 Strip trailing whites from ms files. see #11644 
git-svn-id: https://develop.svn.wordpress.org/trunk@12632 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-07 04:27:46 +00:00
Peter Westwood
816ed91f0f Remove svn:executable property on new files. Fixes #11743 props Denis-de-Bernardy. 
git-svn-id: https://develop.svn.wordpress.org/trunk@12610 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-06 22:22:45 +00:00
Ryan Boren
54675e2ee0 Fix deprecate spelling. Props filosofo. fixes #11758 
git-svn-id: https://develop.svn.wordpress.org/trunk@12606 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-06 20:05:44 +00:00
Peter Westwood
47aaca234b Set svn-eolstyle on some files. See #11644. 
git-svn-id: https://develop.svn.wordpress.org/trunk@12605 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-06 07:50:12 +00:00
Ron Rennick
0b87332865 Adding multi-site settings code 
git-svn-id: https://develop.svn.wordpress.org/trunk@12602 602fd350-edb4-49c9-b593-d223f7449a82
 2010-01-05 20:59:48 +00:00