Commit Graph

21 Commits

Author SHA1 Message Date
Scott Taylor
f19bec8754 In wp_import_handle_upload():
`$file` was essentially getting declared/overwritten 3 times. In lieu of this, return an array containing the error immediately instead of doing a short-circuit array key assignment on error. Rename the local variable to `$upload` and use its properties instead of creating 3 new local vars, one of which stomped the array.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-20 21:10:24 +00:00
Drew Jaynes
097dc8ee15 Fix syntax for single- and multi-line comments in wp-admin-directory files.
See #28931.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-17 09:14:16 +00:00
Scott Taylor
b9afafffe3 hackificator complains if you call include 'file.php' without the parens, needs to be include( 'file.php' )
See #27881.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-18 20:52:15 +00:00
Andrew Nacin
cc7a2e29f5 Slight renaming in our callback in [27373]. see #14424.
Built from https://develop.svn.wordpress.org/trunk@27374


git-svn-id: http://core.svn.wordpress.org/trunk@27223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 17:09:14 +00:00
Mark Jaquith
fb56a9942b Eliminate some of our last remaining create_function() instances
* Moved some into private function callbacks
* Eliminated some that weren't necessary anymore

props obenland, markjaquith, nacin. fixes #14424
Built from https://develop.svn.wordpress.org/trunk@27373


git-svn-id: http://core.svn.wordpress.org/trunk@27222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 16:21:16 +00:00
Andrew Nacin
fef6081046 Move to JSON for three api.wordpress.org endpoints. see #25311.
Built from https://develop.svn.wordpress.org/trunk@25441


git-svn-id: http://core.svn.wordpress.org/trunk@25362 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-14 19:31:08 +00:00
Sergey Biryukov
b13b659365 Fix E_STRICT notice in wp_get_popular_importers(). see #24356.
git-svn-id: http://core.svn.wordpress.org/trunk@24378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-05-28 03:53:59 +00:00
Andrew Nacin
dc0786c0ae Pull the list of popular importers from WordPress.org.
These are the importers we suggest on import.php, prompting the user to
install the relevant plugin for the import they want to go through.

If the API is inaccessible, it falls back to a hard-coded list that should
be kept sync'd with the API with each major version of WordPress. This API
enables us to add new importers between releases, as they are completed or
if services gain quick adoption. As a last resort, we can also temporarily
disable importers that are broken (due to API changes, for example).

The importer currently returns English strings (which are then run through
translate() for existing strings), but the locale is passed to the API,
allowing us to ship translated strings if we wish to be adventurous.

props dllh for the assist.
fixes #18977.



git-svn-id: http://core.svn.wordpress.org/trunk@22632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 07:20:04 +00:00
Andrew Nacin
557d9313a7 Introduce constants to allow for easier expression of time periods in seconds. Adds MINUTE_IN_SECONDS, HOUR_IN_SECONDS, DAY_IN_SECONDS, WEEK_IN_SECONDS, YEAR_IN_SECONDS. props nbachiyski, SergeyBiryukov. fixes #20987.
git-svn-id: http://core.svn.wordpress.org/trunk@21996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-25 05:26:19 +00:00
ryan
e3b46b25d3 Lose EOF ?>. Clean up EOF newlines. fixes #12307
git-svn-id: http://svn.automattic.com/wordpress/trunk@19712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-08 17:01:11 +00:00
ryan
2cfb1592f0 Mark import attachments as private. Schedule job to delete old import attachments. Introduce attachment context.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-22 23:25:28 +00:00
ryan
096efd9957 Remove unnecessary addslashes. Props duck_. fixes #15325
git-svn-id: http://svn.automattic.com/wordpress/trunk@16608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-29 14:40:43 +00:00
ryan
57f26bb58e Remove trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@11971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-09-24 17:19:13 +00:00
westi
a86aa7b399 Handle the file upload case on import when post_max_size is smaller than upload_max_filesize and no POST data arrives at all. Fixes #10830.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-09-23 07:06:58 +00:00
ryan
74b9642857 Append .txt to import files rather than .import. Props donncha
git-svn-id: http://svn.automattic.com/wordpress/trunk@10611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-02-20 21:39:20 +00:00
ryan
9ce46d3937 phpdoc for wp-admin. Props jacobsantos. see #7527
git-svn-id: http://svn.automattic.com/wordpress/trunk@9119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-10 18:21:16 +00:00
ryan
5fd146865b phpdoc for wp-admin/includes from jacobsantos. see #7527
git-svn-id: http://svn.automattic.com/wordpress/trunk@9053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-02 01:03:26 +00:00
ryan
b3fa9f2840 Importer refactoring from tellyworth. fixes #5522
git-svn-id: http://svn.automattic.com/wordpress/trunk@6477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-12-24 06:20:34 +00:00
ryan
e0301f76ea Avoid warning when import dir is empty. Props Viper007Bond. fixes #5395
git-svn-id: http://svn.automattic.com/wordpress/trunk@6411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-12-19 17:48:51 +00:00
ryan
9bfccd6286 Add checks for WP_Error. Props filosofo. see #4809
git-svn-id: http://svn.automattic.com/wordpress/trunk@6125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-09-18 16:32:22 +00:00
ryan
770613e763 Admin includes reorg. see #4334
git-svn-id: http://svn.automattic.com/wordpress/trunk@5542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-05-25 07:16:21 +00:00