Commit Graph

57 Commits

Author SHA1 Message Date
Sergey Biryukov
e199663322 I18N: Capitalize translator comments consistently, add trailing punctuation.
Includes minor code layout fixes.

See #44360.
Built from https://develop.svn.wordpress.org/trunk@45932


git-svn-id: http://core.svn.wordpress.org/trunk@45743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-03 00:41:05 +00:00
Gary Pendergast
7a617078fa Coding Standards: Upgrade WPCS to 1.2.1.
This upgrade fixes quite a few false positives, as well as auto-fixing some indenting issues.

Fixes #45956.


Built from https://develop.svn.wordpress.org/trunk@44574


git-svn-id: http://core.svn.wordpress.org/trunk@44405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-12 06:41:52 +00:00
Peter Wilson
a2c890409b Multisite: Validate activation links.
Built from https://develop.svn.wordpress.org/trunk@44048


git-svn-id: http://core.svn.wordpress.org/trunk@43878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 01:26:24 +00:00
Peter Wilson
481e5f4b36 Multisite: Improve messaging for previously activated users.
Ensure activation of a site is not attempted multiple times and users are shown the correct message if they follow the link a second time.

Built from https://develop.svn.wordpress.org/trunk@44021


git-svn-id: http://core.svn.wordpress.org/trunk@43851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-13 00:23:24 +00:00
Gary Pendergast
8244397ffb Coding Standards: Prepare for upgrading WPCS to 1.0.0.
In order to get the best result when running `phpcbf` across the codebase, there are some manual tweaks we need to make.

These fall into three categories:
- Fixing incorrectly indented code which has flow-on effects when auto-fixing.
- Tweaking the layout of inline PHP inside HTML tags.
- Moving more complex inline PHP inside HTML tags, to execute earlier.

See #44600.


Built from https://develop.svn.wordpress.org/trunk@43569


git-svn-id: http://core.svn.wordpress.org/trunk@43398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-08-15 06:22:26 +00:00
Sergey Biryukov
ac0bf9d352 Login and Registration: Send nocache_headers() on Multisite account activation pages.
Props herregroen.
Fixes #43917.
Built from https://develop.svn.wordpress.org/trunk@43065


git-svn-id: http://core.svn.wordpress.org/trunk@42894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-05-01 22:08:20 +00:00
Andrea Fercia
eac393b6f1 Coding standards: Change a few occurrences of font weight 700 to 600 in multisite signup and activate.
Props chetan200891.
Amends [43018].
See #43897.

Built from https://develop.svn.wordpress.org/trunk@43041


git-svn-id: http://core.svn.wordpress.org/trunk@42870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-04-30 07:05:21 +00:00
Dominik Schilling
aaf1fc64c4 Multisite: Use a numbered placeholder in sprintf() for the site URL.
Fixes missing site domain in the link and a PHP warning.

Props Thomas Vitale, conner_bw.
See #41645.
Fixes #43568.
Built from https://develop.svn.wordpress.org/trunk@42844


git-svn-id: http://core.svn.wordpress.org/trunk@42674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 14:45:30 +00:00
Gary Pendergast
aaf99e6913 Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.


Built from https://develop.svn.wordpress.org/trunk@42343


git-svn-id: http://core.svn.wordpress.org/trunk@42172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-30 23:11:00 +00:00
Sergey Biryukov
fa5abb2474 I18N: Remove HTML tags from translatable strings in wp-activate.php.
Props ramiy.
Fixes #41645.
Built from https://develop.svn.wordpress.org/trunk@41579


git-svn-id: http://core.svn.wordpress.org/trunk@41412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-09-23 12:21:47 +00:00
Drew Jaynes
0401cee8b3 Docs: Reduce confusion in @since MU notationss by indicating the WP version (3.0.0) the code was merged into core while retaining the original context.
Props sathyapulse.
Fixes #41509.

Built from https://develop.svn.wordpress.org/trunk@41200


git-svn-id: http://core.svn.wordpress.org/trunk@41040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-08-01 20:44:43 +00:00
Jeremy Felt
1084773c1c Multisite: Use get_home_url() instead of get_blogaddress_by_id() in wp-activate.php.
`get_home_url()` is a better fit for the "View your site" link and can be properly filtered. This is the last remaining use of `get_blogaddress_by_id()` in core.

Props boboudreau, spacedmonkey.
Fixes #26855.

Built from https://develop.svn.wordpress.org/trunk@38664


git-svn-id: http://core.svn.wordpress.org/trunk@38607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-27 21:36:28 +00:00
Dominik Schilling
d23b1534b8 I18N: Add translators comments to wp-activate.php.
Props ramiy.
Fixes #35734.
Built from https://develop.svn.wordpress.org/trunk@37552


git-svn-id: http://core.svn.wordpress.org/trunk@37520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-24 21:02:28 +00:00
Drew Jaynes
e52762a725 Docs: Apply inline @see tags to hooks referenced in DocBlocks for root directory files.
Applying these specially-crafted `@see` tags allows the Code Reference parser to recognize and link these elements as hooks.

See #36921.

Built from https://develop.svn.wordpress.org/trunk@37536


git-svn-id: http://core.svn.wordpress.org/trunk@37504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 17:07:28 +00:00
Eric Lewis
22467e840f Networks and sites: Replace "blog" usage with "site" in docs.
Multisite functions use the term "blog" to refer to what we now call a "site," e.g. `get_current_blog_id()`. These functions are here to stay because of our commitment to backwards compatibility. What we can do is set the documentation straight.

See #35417.

Built from https://develop.svn.wordpress.org/trunk@36416


git-svn-id: http://core.svn.wordpress.org/trunk@36383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-28 03:35:27 +00:00
Jeremy Felt
8286a4f214 Registration: Remove the last remaining Lucida Grande from WordPress.
Defer to default styling provided by the theme (and browser) in `wp-activate.php` and remove the `font-family` and `color` from the provided internal stylesheet.

Previously, [17327] and [18406].

Fixes #34145.

Built from https://develop.svn.wordpress.org/trunk@34882


git-svn-id: http://core.svn.wordpress.org/trunk@34847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-06 21:56:24 +00:00
Jeremy Felt
ab5ea42aa2 MS: Pass context to get_header() and get_footer() in activation/signup.
Fixes #21712.

Built from https://develop.svn.wordpress.org/trunk@34840


git-svn-id: http://core.svn.wordpress.org/trunk@34805 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-05 22:36:24 +00:00
Jeremy Felt
908b1f0b7d MS: Align HTML structure in wp-signup.php and wp-activate.php.
Assigns the `wp-activate-container` and `wp-signup-container` to the container inside `#signup-container` on each. This container already existed in `wp-signup.php` and is new in `wp-activate.php`.

Props ocean90.
Fixes #25478.

Built from https://develop.svn.wordpress.org/trunk@34814


git-svn-id: http://core.svn.wordpress.org/trunk@34779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-03 21:51:25 +00:00
John Blackbourn
cf5ac0b6bf Use wp_login_url() for login links when signing up for a new blog or activating a new blog on Multisite.
Fixes #31495
Props GregLone for the intial patch

Built from https://develop.svn.wordpress.org/trunk@34790


git-svn-id: http://core.svn.wordpress.org/trunk@34755 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-03 00:34:25 +00:00
John Blackbourn
a9e5cfddc7 Implement wp_login_url() and wp_registration_url() in places where wp-login.php is currently hard-coded.
See #31495
Props GregLone

Built from https://develop.svn.wordpress.org/trunk@34213


git-svn-id: http://core.svn.wordpress.org/trunk@34177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 17:11:35 +00:00
Scott Taylor
d7d5789088 TwentyFifteen|Sixteen themes have a <div id="content"> in the header. Change the <div> IDs in wp-activate.php and wp-signup.php to be unique to each page.
Props jfarthing84.
Fixes #33843.

Built from https://develop.svn.wordpress.org/trunk@34162


git-svn-id: http://core.svn.wordpress.org/trunk@34130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 02:09:24 +00:00
Scott Taylor
dc4d08e032 wpmu_activate_signup() returns an array or WP_Error. The array keys it returns can be different based on context of $signup. The return value was previously extract()'d, so the value of $blog_id was secretly undefined when being passed to get_blogaddress_by_id() in some cases.
If `$result['blog_id']` is not set, make sure `$url` is set to an empty string so that the proper "activated" message is shown to the user.

Props imath.
See [28373].
Fixes #29191.

Built from https://develop.svn.wordpress.org/trunk@29554


git-svn-id: http://core.svn.wordpress.org/trunk@29329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-20 17:30:16 +00:00
Scott Taylor
2f513d3320 Fix some hackificator odds and ends in wp-admin:
* `wp-activate.php` and `wp-admin/themes.php` don't need the closing PHP tag
* Switch single quotes for HTML attribute values to double in a few places
* Convert `include_once file.php` syntax to `include_once( 'file.php' )`
* Add access modifiers to methods/members in: `_WP_List_Table_Compat`, `Walker_Nav_Menu_Edit`, `Walker_Nav_Menu_Checklist`, `WP_Screen`, `Walker_Category_Checklist`
* `edit_user()` doesn't need to import the `$wpdb` global
* `wp_list_widgets()` doesn't need to import the `$sidebars_widgets` global
* switch/endswitch syntax is not supported in Hack
* A `<ul>` in `wp-admin/users.php` is unclosed

See #27881.

Built from https://develop.svn.wordpress.org/trunk@28500


git-svn-id: http://core.svn.wordpress.org/trunk@28326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 05:04:16 +00:00
Scott Taylor
8af6a4230e Eliminate use of extract() in wp-activate.php.
Props jeremyfelt, MikeHansenMe.
See #22400.

Built from https://develop.svn.wordpress.org/trunk@28373


git-svn-id: http://core.svn.wordpress.org/trunk@28201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-13 03:14:16 +00:00
Drew Jaynes
cd8cedc40d First there were two, and now there are three -- in the @since versions that came before and that shall be. And so it will be, says nacin.
Props JustinSainton, SergeyBiryukov, DrewAPicture.
Fixes #26713.

Built from https://develop.svn.wordpress.org/trunk@26868


git-svn-id: http://core.svn.wordpress.org/trunk@26754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-24 18:57:12 +00:00
Andrew Nacin
628bbce42a Avoid 404 for wp-activate.php.
props nullvariable.
fixes #24960.

Built from https://develop.svn.wordpress.org/trunk@25690


git-svn-id: http://core.svn.wordpress.org/trunk@25606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-04 14:12:11 +00:00
Andrew Nacin
fd57b239d2 Don't rely on include_path to include files.
Always use dirname() or, once available, ABSPATH.

props ketwaroo, hakre.
fixes #17092.

Built from https://develop.svn.wordpress.org/trunk@25616


git-svn-id: http://core.svn.wordpress.org/trunk@25533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-25 00:18:11 +00:00
Drew Jaynes
65bcc3f004 Inline documentation for hooks in wp-activate.php.
Props nullvariable for the initial patch.
See #25229.

Built from https://develop.svn.wordpress.org/trunk@25537


git-svn-id: http://core.svn.wordpress.org/trunk@25457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-21 05:21:09 +00:00
Helen Hou-Sandí
b538d6163f Make sure .widefat border and background coloring only applies to tables. props MikeHansenMe. fixes #21936.
git-svn-id: http://core.svn.wordpress.org/trunk@23315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-01-22 14:44:04 +00:00
Ryan Boren
06ee370814 Pinking shears
git-svn-id: http://core.svn.wordpress.org/trunk@22634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 15:11:29 +00:00
Ryan Boren
7b62c8753d Fix typo in phpdoc. Props SergeyBiryukov. fixes #20429
git-svn-id: http://core.svn.wordpress.org/trunk@22266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-10-22 12:44:28 +00:00
nacin
a69abc1f47 Docs for wp-activate.php. props lgedeon. fixes #20429.
git-svn-id: http://core.svn.wordpress.org/trunk@21454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-06 00:59:34 +00:00
nacin
7127ed1197 Move most instances of new WP_User to get_userdata(). see #21120.
git-svn-id: http://core.svn.wordpress.org/trunk@21413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-03 01:06:05 +00:00
ryan
07ff8b216b Use one space, not two, after trailing punctuation. fixes #19537
git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-13 23:45:31 +00:00
nacin
92ba22e537 Use wp_lostpassword_url() instead of site_url(wp-login...). Update wp_lostpassword_url() to use network_site_url(). props markoheijnen, fixes #18808.
git-svn-id: http://svn.automattic.com/wordpress/trunk@19027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-20 14:40:11 +00:00
markjaquith
87f06616a7 A few "login" used as a verb fixes. props xibe. fixes #17335
git-svn-id: http://svn.automattic.com/wordpress/trunk@17831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-07 03:26:23 +00:00
westi
10f5e5f424 Use static strings and respect coding standards in wp-activate.php. Fixes #17158 props niallkennedy.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-17 21:31:38 +00:00
ryan
498c93cb81 Revert [17327] and [15858]. Props markmcwilliams, JohnONolan, et al. see #16298 #8352
git-svn-id: http://svn.automattic.com/wordpress/trunk@17347 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-22 03:25:29 +00:00
nacin
d4dd0fe211 Remove Lucida Grande from the remaining font stacks. We should at least be consistent. props demetris, fixes #16298, see #8352.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-19 09:44:17 +00:00
nacin
c99f4a9929 Revert [15830] for wp-activate.php. see #15064, fixes #15976.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-25 21:12:48 +00:00
nacin
05fde90357 Move registration.php functions to user.php. Deprecate registration.php, everything is now included by default. fixes #13761.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 10:46:24 +00:00
westi
432f2a4456 Use the api to build site urls. Props nacin.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 10:29:27 +00:00
scribu
799baf139c Use submit_button() in more places. See #15064
git-svn-id: http://svn.automattic.com/wordpress/trunk@15830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-17 18:24:34 +00:00
markjaquith
7944bd5d82 These are not verbs. http://notaverb.com/badbad_verbs
git-svn-id: http://svn.automattic.com/wordpress/trunk@15473 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-07-27 18:02:45 +00:00
nbachiyski
1e3b84960f Take out opening and closing <p> tags from translation strings. Focus on the key input on page load.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-19 12:01:32 +00:00
nacin
6ec7cb4540 Use relative paths when including files, avoiding include_path. fixes #12594, props sorich87.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-18 06:14:45 +00:00
dd32
442d41291a Tweak new strings for better typography. Props demetris. Fixes #12962
git-svn-id: http://svn.automattic.com/wordpress/trunk@14070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-11 10:41:54 +00:00
ryan
8e4859a35c Use network_*_url(). see #12736
git-svn-id: http://svn.automattic.com/wordpress/trunk@13884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-29 21:45:31 +00:00
wpmuguru
b15477fd95 more multisite UX rebranding, See #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@13384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-24 20:45:02 +00:00
wpmuguru
c644b16083 add activate_wp_head hook to wp-activate.php, fixes #12166
git-svn-id: http://svn.automattic.com/wordpress/trunk@13073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-13 00:33:47 +00:00