sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
14,453 Commits 2 Branches 473 Tags 137 MiB
bcbb15ca21
Commit Graph

71 Commits

Author SHA1 Message Date
Andrew Nacin
f7345eb522 wp_htmledit_pre for salts in wp-admin/network. fixes #15092. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15965 602fd350-edb4-49c9-b593-d223f7449a82
 2010-10-26 03:36:23 +00:00
Andrew Nacin
0799c3f519 Avoid extra conditional in the subdirectory rewrite rules. props wpmuguru, fixes #15083. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15949 602fd350-edb4-49c9-b593-d223f7449a82
 2010-10-24 21:09:33 +00:00
Andrew Nacin
76a83d9086 Correct typo and use full blogs.dir path. props filosofo, fixes #14871. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15618 602fd350-edb4-49c9-b593-d223f7449a82
 2010-09-14 16:53:28 +00:00
Andrew Nacin
f680252c00 Add a constant for allow_subdirectory_install as conventional plugins have to be disabled on network.php. fixes #13844. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15225 602fd350-edb4-49c9-b593-d223f7449a82
 2010-06-11 16:38:11 +00:00
Andrew Nacin
53d3846f6a target=blank for help. props jorbin, see #13467 
git-svn-id: https://develop.svn.wordpress.org/trunk@15132 602fd350-edb4-49c9-b593-d223f7449a82
 2010-06-03 21:00:39 +00:00
Ryan Boren
f69da134f5 Help text cleanup. Props zeo. fixes #13467 
git-svn-id: https://develop.svn.wordpress.org/trunk@15126 602fd350-edb4-49c9-b593-d223f7449a82
 2010-06-03 13:37:51 +00:00
Ryan Boren
0922715668 Cut 'em out, move 'em on, trailing whitespace 
git-svn-id: https://develop.svn.wordpress.org/trunk@15116 602fd350-edb4-49c9-b593-d223f7449a82
 2010-06-02 20:04:07 +00:00
Andrew Nacin
7bf4b1e790 Proper whitespace before and after content within a textarea on network.php. props ocean90. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15076 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-31 15:27:31 +00:00
Nikolay Bachiyski
ea4293b291 Better detection whether we are on the Network page. Use custom constant to tell us. See #13565, props nacin 
We used to load multisite translations each time WP_ALLOW_MULTISITE was defined, but
it could lead to alot of false positives. Generic config files can include to allow
users to updgrade to multisite without further editing the config file.


git-svn-id: https://develop.svn.wordpress.org/trunk@15064 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-29 20:35:19 +00:00
Nikolay Bachiyski
3b599031a1 Remove a space in the beginning of a translatable string. 
It was a typo -- the space should have been between the parent and the quote.


git-svn-id: https://develop.svn.wordpress.org/trunk@15051 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-29 12:12:48 +00:00
Ron Rennick
ae20f0776b will the real host please step forward, fixes #13594 
git-svn-id: https://develop.svn.wordpress.org/trunk@15037 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-28 16:40:55 +00:00
Andrew Nacin
764331ccef Better branching to account for mod_rewrite mimicry. see #12758. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15026 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-28 02:58:21 +00:00
Andrew Nacin
b949e4b179 Add some Apache checks to some notices in network.php. see #12758. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15025 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-28 02:52:40 +00:00
Andrew Nacin
8b30a198eb Don't tell IIS users to back up their .htaccess files. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15024 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-28 02:41:01 +00:00
Andrew Nacin
921a5841b0 Use the variable set up for when the function doesn't exist. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15022 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-28 02:12:57 +00:00
Andrew Nacin
1cd2078e8e Typo (fix, not add). props duck_. see #13467. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15005 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-27 21:25:57 +00:00
Andrew Nacin
c20f8db1fb Help for multisite. props andrea_r, dougwrites, duck_. see #13467. 
git-svn-id: https://develop.svn.wordpress.org/trunk@15004 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-27 21:20:23 +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
Ron Rennick
db587b9486 apache rewrite rule cleanup, props filosofo, fixes #13540 
git-svn-id: https://develop.svn.wordpress.org/trunk@14914 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-25 23:55:32 +00:00
Andrew Nacin
a3e2f4b9ca Improved mayday calls in network.php when a subdirectory install isn't allowed. Also, /allow_folder_install/allow_subdirectory_install/g. fixes #12884, fixes #12931. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14884 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-25 15:16:31 +00:00
Ron Rennick
aa8a5ab580 update rewrite rules for IIS, props Frumph, see #12758 
git-svn-id: https://develop.svn.wordpress.org/trunk@14871 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-25 05:12:47 +00:00
Mark Jaquith
2a90aeb2a6 stripslashes() the site name before passing to populate_network(), not in it. We should always expect unslashed data. reverts [14754]. fixes #13448 
git-svn-id: https://develop.svn.wordpress.org/trunk@14845 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-24 19:18:30 +00:00
Andrew Nacin
d49e62fa35 Show warning in network.php if using a custom wp-content directory. fixes #11742. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14825 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-23 22:19:09 +00:00
Andrew Nacin
7e6f346bdd Translate some hard-coded strings. props PeteMall. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14719 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-18 04:41:08 +00:00
Andrew Nacin
83081d3feb Validation for network.php. props dremeda, see #13383. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14659 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-15 06:49:16 +00:00
Andrew Nacin
4861bebf05 Add a form action to network.php. props xibe, see #13383. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14657 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-15 06:19:27 +00:00
Andrew Nacin
06fc3ff50f Close wrapper div when ending network_step1 with a warning. props Caspie, fixes #13389. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14630 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-14 12:34:48 +00:00
Ron Rennick
0d826fa206 add subdomain explanation to network install, see #12931 
git-svn-id: https://develop.svn.wordpress.org/trunk@14514 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-08 15:43:00 +00:00
Ron Rennick
9c8a73aa37 add network install rule, filter & UI tweaks, see #12931 
git-svn-id: https://develop.svn.wordpress.org/trunk@14513 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-08 15:25:33 +00:00
Andrew Nacin
71c9ad21de Link to active plugins when we block a Network upgrade due to them. props ocean90. 
git-svn-id: https://develop.svn.wordpress.org/trunk@14463 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-05 18:43:54 +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
997a121259 allow subdir multisite on ip address, see #12142 
git-svn-id: https://develop.svn.wordpress.org/trunk@14386 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-03 19:23:37 +00:00
Ryan Boren
57a5a11660 Revert [14347] and [14372]. It broke more than we expected. Try again in 3.1. see #13051 
git-svn-id: https://develop.svn.wordpress.org/trunk@14374 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-03 18:16:22 +00:00
Ryan Boren
7fcda10d46 Escape links by default. Props alexkingorg. see #13051 
git-svn-id: https://develop.svn.wordpress.org/trunk@14347 602fd350-edb4-49c9-b593-d223f7449a82
 2010-05-02 22:53:59 +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
2fc834c550 More verbose message on how to add MS constants to one's config file. props sivel, see #12848 
git-svn-id: https://develop.svn.wordpress.org/trunk@13999 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-04 23:49:11 +00:00
Ron Rennick
52c9389af1 fix folder install detection in [13926], see #12736 
git-svn-id: https://develop.svn.wordpress.org/trunk@13930 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-02 03:27:08 +00:00
Andrew Nacin
96144d31d9 Switch from wp_die() to a nice error message for siteurl!=home for network.php. see #12736 
git-svn-id: https://develop.svn.wordpress.org/trunk@13929 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-02 03:24:18 +00:00
Ron Rennick
fc051c063f block subdomain install when install is in a folder, see #12736 
git-svn-id: https://develop.svn.wordpress.org/trunk@13926 602fd350-edb4-49c9-b593-d223f7449a82
 2010-04-02 02:04:25 +00:00
Ron Rennick
ca9b460f34 block enabling network when siteurl and home are not the same, see #12736 
git-svn-id: https://develop.svn.wordpress.org/trunk@13904 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-31 18:23:05 +00:00
Andrew Nacin
3d67dd8d50 Use actual hostname instead of example.com in subdirectory/subdomain examples. fixes #12679, props johnbillion. 
git-svn-id: https://develop.svn.wordpress.org/trunk@13811 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-25 02:49:23 +00:00
Andrew Nacin
1559240917 Some improvements to the network.php mod_rewrite checks. see #12255 
git-svn-id: https://develop.svn.wordpress.org/trunk@13782 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-20 22:44:07 +00:00
Ryan Boren
e61755c853 Trim trailing whitespace 
git-svn-id: https://develop.svn.wordpress.org/trunk@13733 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-17 16:27:25 +00:00
Andrew Nacin
0e567e38f1 Don't allow access to network.php if running an MU network. It is only for networks created in 3.0. see #11816. Also, fix MS htaccess logic, see #12136 
git-svn-id: https://develop.svn.wordpress.org/trunk@13679 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-11 23:53:03 +00:00
Andrew Nacin
403bf947e1 Don't check for the existence of index.php in the htaccess rewrite rules. props miqrogroove. see #11845 
git-svn-id: https://develop.svn.wordpress.org/trunk@13676 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-11 22:58:43 +00:00
Andrew Nacin
0d3634ecbd Improve multisite rewrite rules. Construct rules dynamically and skip subdirectory-specific rules for subdomain installs. see #12136 
git-svn-id: https://develop.svn.wordpress.org/trunk@13675 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-11 22:33:52 +00:00
Andrew Nacin
ef7e0ef243 Remove dummy contextual help from network.php. We'll need some real docs. #11816 
git-svn-id: https://develop.svn.wordpress.org/trunk@13656 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-11 03:15:09 +00:00
Andrew Nacin
d6adc0701c First pass at error handling for populate_network() and network.php. see #11816 
git-svn-id: https://develop.svn.wordpress.org/trunk@13655 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-11 01:51:24 +00:00
Andrew Nacin
f59126029d Remove unused MU function and unnecessary separate includes file. see #11816 
git-svn-id: https://develop.svn.wordpress.org/trunk@13644 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-10 08:46:05 +00:00
Andrew Nacin
c2bb5992ee Store subdomain/subdirectory choice in sitemeta. For now, only used in case we return to network.php without constants. see #11816 
git-svn-id: https://develop.svn.wordpress.org/trunk@13642 602fd350-edb4-49c9-b593-d223f7449a82
 2010-03-10 08:34:42 +00:00