PHP warning when creating a new site as part of a network

[jkudish]

I get the following error when I create a new site as part of a network running an up-to-date checkout of trunk.

Notice: Undefined variable: s in .../wp/wp-admin/network/site-new.php on line 88

My setup is a bit particular but I am fairly positive it has nothing to do with the bug. Here it goes anyway:

• locally hosted, using MAMP Pro, mapped to a .dev domain using my hosts file
• subdomain setup for multisite
• WordPress is in a subfolder on the domain, in a folder named 'wp'
• The wp-content folder has been moved to '/content'

The double quotes are causing the $ to be executed as variables by the PHP parser instead of being interpreted as strings to replace by sprintf
Patch attached that fixes the issue.

[nacin]

Broken in [22272].

[nacin]

[22273] [22271] [22270] all look good.

[nacin]

The attached patch breaks the string; it is no longer translatable. We'll need to A) escape them, B) remove them, or C) add manual line breaks to the string. B or C are probably most friendly to the translators.

[jkudish]

In ​22486.2.diff:

How's this approach? It splits the string up into 3 which may or may not be ideal for translators.

[SergeyBiryukov]

In ms-functions.php we use actual line breaks for such strings:
​http://core.trac.wordpress.org/browser/tags/3.4.2/wp-includes/ms-functions.php#L1027

22486.3.diff​ does the same for consistency.

[nacin]

In 22664:

Add manual new lines to a string, as double quotes with \n is not optimal due to sprintf-parsing reasons. props SergeyBiryukov, fixes #22486. see #22260.