Commit Graph

425 Commits

Author SHA1 Message Date
dd32
86577f34ea Fix a small typo.
git-svn-id: http://svn.automattic.com/wordpress/trunk@20070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-03-02 11:00:51 +00:00
duck_
bb94e702f8 Drop image resizing code from wp_handle_upload(). Fixes #19800.
This code stops wp_handle_upload() from reporting errors when the upload couldn't be moved to its final local and it was a non-JS fallback that is unused.


git-svn-id: http://svn.automattic.com/wordpress/trunk@20019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-02-28 20:02:43 +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
dd32
e15f5275a8 Fix edge case in get_home_path() where the incorrect path may be returned. Props ptahdunbar. Fixes #18768
git-svn-id: http://svn.automattic.com/wordpress/trunk@19697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-01-06 13:46:22 +00:00
ryan
340e93324c Remove extraneous spaces. Props kenan3008, dimadin. fixes #19501 #19433
git-svn-id: http://svn.automattic.com/wordpress/trunk@19596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-12-14 17:36:38 +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
azaozz
331b242bcd Revert [19223] and only stop showing the checkbox, props nacin, see #19174
git-svn-id: http://svn.automattic.com/wordpress/trunk@19225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-08 22:34:09 +00:00
azaozz
623220187a Remove the Resize files checkbox for now (revisit in 3.4), fixes #19174
git-svn-id: http://svn.automattic.com/wordpress/trunk@19223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-11-08 22:23:40 +00:00
ryan
62afab8db3 Pinking shears
git-svn-id: http://svn.automattic.com/wordpress/trunk@19054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-10-24 19:13:23 +00:00
markjaquith
37e23be4ed Be more consistent with ERROR: messages. fixes #15887
git-svn-id: http://svn.automattic.com/wordpress/trunk@18841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-30 17:18:35 +00:00
duck_
c1d1590171 Fix typos in documentation (wp-admin/). See #18560.
git-svn-id: http://svn.automattic.com/wordpress/trunk@18632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-09-03 14:18:10 +00:00
azaozz
9a65f6e237 Fix handling of resizing images after upload, props ocean90, see #18206
git-svn-id: http://svn.automattic.com/wordpress/trunk@18517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-08-06 21:04:15 +00:00
azaozz
91a8720fff Pluploader take 1, props jacobwg, see #18206
git-svn-id: http://svn.automattic.com/wordpress/trunk@18482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-07-29 08:59:35 +00:00
ryan
a117773fc8 Typo fix. Props kawauso. fixes #18177
git-svn-id: http://svn.automattic.com/wordpress/trunk@18447 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-07-21 17:46:01 +00:00
markjaquith
029a8d1bef Remove code formatting from uploaded file size error messages, for now. props JohnONolan. fixes #17674
git-svn-id: http://svn.automattic.com/wordpress/trunk@18193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-06-08 16:27:57 +00:00
nacin
da2732c7de Use wp_remote_retrieve_* helper functions instead of the raw HTTP response array. props aaroncampbell, fixes #17416.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-05-14 19:45:07 +00:00
westi
80f4e83a8c Introduce WP_MAX_MEMORY_LIMIT constant for the high memory limit we set when image processing and unzipping.
Ensure it is always filterable by plugins as well as configurable in wp-config
Fixes #13847 props hakre


git-svn-id: http://svn.automattic.com/wordpress/trunk@17749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-28 16:25:36 +00:00
dd32
bed23730dc Handle zip error's in PclZip better. PclZip::extract() returns an array on success, 0 on failure. Fixes #17224
git-svn-id: http://svn.automattic.com/wordpress/trunk@17693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-23 14:30:44 +00:00
dd32
9081c7636c Set the mb_string internal encoding to ISO-8859-1 whilst uncompressing archives using PclZip. Fixes 'PCLZIP_ERR_BAD_FORMAT (-10) : Invalid block size' errors on systems utilising mbstring.func_overload. Fixes #15789
git-svn-id: http://svn.automattic.com/wordpress/trunk@17592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-04-03 12:32:06 +00:00
dd32
5b12ecb83d Be a party-pooper; No more Akismet Dancing upon upgrade; Respect custom WP_CONTENT_DIR for bundled plugins/theme installation; Respect custom WP_CONTENT_DIR/WP_LANG_DIR for Language files when upgrading; Standardise WP_Filesystem path method returns (They're trailing slash'd). Adds an exclusion list to copy_dir() as well as WP_Filesystem_Base::wp_lang_dir(). See #14484 See #11495
git-svn-id: http://svn.automattic.com/wordpress/trunk@17576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-31 13:28:36 +00:00
dd32
00dc7a57d6 First run of introducing Stream-To-File for the WP_HTTP API. Reduces memory consumption during file downloads. Implemented in download_url() for upgraders. Props sivel. See #16236
git-svn-id: http://svn.automattic.com/wordpress/trunk@17555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-25 02:42:20 +00:00
dd32
a83a2842ea Optimisations to WP_Filesystem; Pass known information to called functions. Props aldenta (John Ford) for investigation and patch. See #10913
git-svn-id: http://svn.automattic.com/wordpress/trunk@17525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-03-22 00:04:15 +00:00
nacin
53d0af84b0 Don't esc_html the default error string. props SergeyBiryukov, fixes #16058.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2011-01-01 22:14:42 +00:00
nacin
e5b099a459 Add missing translation for 'Page Template' in the theme editor. props SergeyBiryukov, fixes #15933.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-21 14:58:54 +00:00
westi
1bb4914c3a Allow for the callee of download_url() to specify a different timeout if they want to - maybe they don't want to wait that long.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-07 12:45:24 +00:00
nacin
5021403b9d Add 'Visual Editor RTL Stylesheet' to the list of theme file descriptions. see #15672.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-04 04:22:48 +00:00
markjaquith
ad6e83136d Improve the wording of the file upload security message. props janeforshort. fixes #13550
git-svn-id: http://svn.automattic.com/wordpress/trunk@16577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-24 20:45:21 +00:00
ryan
847499e531 Pinking shears
git-svn-id: http://svn.automattic.com/wordpress/trunk@16438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-17 18:47:34 +00:00
nacin
d81d7b7f4a Some escaping
git-svn-id: http://svn.automattic.com/wordpress/trunk@16366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-11-14 17:33:16 +00:00
markjaquith
fc6e89da45 Expand submit_button() capabilities. Replace all (or almost all) manual HTML instances in WP. props sbressler. see #15064
git-svn-id: http://svn.automattic.com/wordpress/trunk@16061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-28 21:56:43 +00:00
nacin
82b1349664 Docs for wp-admin/includes/file.php. props sivel, see #14783.
git-svn-id: http://svn.automattic.com/wordpress/trunk@16024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-10-27 22:24:06 +00:00
nacin
1dee100f3a Fix typo. props mrmist, fixes #14571.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-09-07 15:11:43 +00:00
dd32
fe5e3d0fb6 Do not check to see if parents of folders outside of the Destination folder exist within the Archive extractors, unzip_file() will take care of that area. Fixes #13741
git-svn-id: http://svn.automattic.com/wordpress/trunk@15156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-07 11:19:51 +00:00
nacin
3ba9fc235c More request_filesystem_credentials() string improvements.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-03 18:58:41 +00:00
nacin
80437ca9e1 Add missing spaces.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15099 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-01 21:57:26 +00:00
nacin
09c448f63e Clarify the connection information requested in request_filesystem_credentials() to reduce confusion surrounding FTP information versus your WordPress login. see #13467, props jane.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-06-01 20:35:59 +00:00
dd32
92eeafce24 Always fallback to PclZip in the event that ZipArchive does not return true. The PHP Zip extension is hit-and-miss with OSX generated zip files, sometimes 0 will be emitted and extraction will succeed, others it will fail with. Reverts r14346, r14377, partially r14800. See #12637. See #13491
git-svn-id: http://svn.automattic.com/wordpress/trunk@15052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-29 13:16:35 +00:00
ryan
1a552dd029 Strip trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@14924 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-26 02:42:15 +00:00
dd32
989a52d7ff Ensure that the entire folder structure exists within the $needed_folders array before attempting to create folders. Fixes cases where the Zip file does not contain a node for a folder which contains subfolders without files in the same level. Fixes #13171
git-svn-id: http://svn.automattic.com/wordpress/trunk@14811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-23 05:56:31 +00:00
dd32
f8111531f4 Correct the ZipArchive opening test logic. See #13491
git-svn-id: http://svn.automattic.com/wordpress/trunk@14800 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-22 05:09:08 +00:00
nacin
7c8a77efa3 Introduce wp_check_filetype_and_ext() to handle mime/ext image comparisons and corrections for upload and sideload. props Viper007Bond, see #11946.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-15 04:47:03 +00:00
dd32
72f99c8a96 Silence PHP Warnings on is_writable calls. Can trigger open_basedir warnings on certain hosting environments. Props ocean90. Fixes #12866
git-svn-id: http://svn.automattic.com/wordpress/trunk@14427 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 23:39:57 +00:00
nacin
248f4ab860 Provide a context to wp_handle_upload to differentiate between upload and sideload. props technosailor, fixes #12740.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14418 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 22:16:48 +00:00
ryan
7b7243d94a Strip trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:26:11 +00:00
nacin
efa2e9d397 Ensure image MIME type matches extension for images. props Viper007Bond, fixes #11946.
git-svn-id: http://svn.automattic.com/wordpress/trunk@14400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 20:17:01 +00:00
dd32
79bb63a4e0 Fix ZIP_ER_OK constant, Its a class constant, and only accessible as such under PHP5. Props sivel for noticing. Fixes #12637
git-svn-id: http://svn.automattic.com/wordpress/trunk@14377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-03 18:44:34 +00:00
dd32
2db60de875 Skip over __MACOSX folders during zip extraction. Props chrisbliss18. Fixes #12637
git-svn-id: http://svn.automattic.com/wordpress/trunk@14349 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-02 23:24:36 +00:00
dd32
3213eab0f8 Check for "ZIP_ER_OK" return value on ZipArchive. See #12637
git-svn-id: http://svn.automattic.com/wordpress/trunk@14346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-05-02 22:25:30 +00:00
dd32
d5ee7bca10 Replace use of tmpfile() with a safe get_temp_dir(). tmpfile() may use a temporary directly which is not writable. Add static caching to get_temp_dir() & better protect against bad server configs. Fixes #12866
git-svn-id: http://svn.automattic.com/wordpress/trunk@14016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-06 11:20:51 +00:00
nacin
f925c3c2b4 Adjust get_file_description() to account for absolute paths. see #12843
git-svn-id: http://svn.automattic.com/wordpress/trunk@13994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-04 12:07:27 +00:00
nacin
37faed2c03 Give names to author.php and tag.php in the theme editor.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-04 11:23:09 +00:00
nacin
6182fa89af Give editor-style.css a name in the theme editor.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-04-04 11:14:29 +00:00
nacin
a7feaed0e6 Change @since 3.0 to @since 3.0.0.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-26 19:13:36 +00:00
nacin
6e0976117a Fix potential notice in wp_handle_sideload().
git-svn-id: http://svn.automattic.com/wordpress/trunk@13825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-26 17:42:34 +00:00
ryan
e25a65b36a Trim trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@13733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-17 16:27:25 +00:00
nacin
f6415fc7eb Fix logic and pull static code out of a loop. fixes #12581
git-svn-id: http://svn.automattic.com/wordpress/trunk@13662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-11 17:21:18 +00:00
nacin
20eae9d24a Use disabled() form helper. fixes #12581
git-svn-id: http://svn.automattic.com/wordpress/trunk@13661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-11 17:12:23 +00:00
nacin
c4fa74306d Support for extra POST fields in WP_Filesystem. props dd32. see #12094
git-svn-id: http://svn.automattic.com/wordpress/trunk@13577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-03-03 19:53:39 +00:00
ryan
a55b30dcaf Pass overrides. Allow ref array calling. Props tychay. fixes #12278
git-svn-id: http://svn.automattic.com/wordpress/trunk@13290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-22 16:54:51 +00:00
nacin
364b9b0ffb Remove debug cruft. Fixes #12230
git-svn-id: http://svn.automattic.com/wordpress/trunk@13223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-19 14:12:12 +00:00
dd32
9d23c565bd Fallback to PclZip in the event that ZipArchive cannot handle a given archive properly. Close the Zip handle when we're done as well. Fixes #12230
git-svn-id: http://svn.automattic.com/wordpress/trunk@13221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-19 10:59:32 +00:00
ryan
c9d92fc859 Trim trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@13025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-08 18:02:23 +00:00
westi
5128c1ccc2 Make _unzip_file_ziparchive() PHP4 safe. See #10403.
git-svn-id: http://svn.automattic.com/wordpress/trunk@13015 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-07 21:28:05 +00:00
dd32
ca925d3bfa PHPdoc for _unzip_file_pclzip & _unzip_file_ziparchive. See #10403
git-svn-id: http://svn.automattic.com/wordpress/trunk@13007 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-07 05:07:36 +00:00
dd32
5b6d0357b2 Better error checking for ZipArchive extraction. See #10403
git-svn-id: http://svn.automattic.com/wordpress/trunk@13006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-07 05:02:24 +00:00
dd32
5d72fa3d97 Introduce ZipArchive version of unzip_file(), More efficient on memory usage for supporting hosts. See #10403
git-svn-id: http://svn.automattic.com/wordpress/trunk@13005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-07 04:52:35 +00:00
ryan
9f8149616d ms-functions pruning and cleanup. Props nacin. see #11644
git-svn-id: http://svn.automattic.com/wordpress/trunk@12948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-02-04 18:57:32 +00:00
dd32
4e5292e08f Optimised unzip_file(), reduces is_dir() IO calls. See #10779
git-svn-id: http://svn.automattic.com/wordpress/trunk@12794 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-22 11:02:09 +00:00
ryan
94859834fc i18n fixes. Props nbachiyski. fixes #11954
git-svn-id: http://svn.automattic.com/wordpress/trunk@12789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-21 21:37:43 +00:00
ryan
8760e7da1b Coding standards, space after if
git-svn-id: http://svn.automattic.com/wordpress/trunk@12752 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-18 20:34:48 +00:00
ryan
6da55f7792 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@12733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-15 22:11:12 +00:00
dd32
41e561b941 Standardise WP_Filesystem_*::put_contents() arguments to support chmod reliably across all transports. Fixes #10889
git-svn-id: http://svn.automattic.com/wordpress/trunk@12723 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-01-14 09:23:53 +00:00
azaozz
b3871f9247 Replace ctype_digit() with is_numeric() for better compatibility, props markup, fixes #11620 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@12544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-26 08:47:47 +00:00
ryan
b9dfd1fb4a Check upload_tmp_dir ini settings for a usable temporary path. Props Denis-de-Bernardy. fixes #6699
git-svn-id: http://svn.automattic.com/wordpress/trunk@12519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-23 16:22:26 +00:00
ryan
4bbaabff55 Increase download_url() timeout to 5 minutes. fixes #11551 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@12489 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-22 16:42:30 +00:00
ryan
8b5ba8c556 Fix file validation in theme editor. Props dd32. fixes #11032
git-svn-id: http://svn.automattic.com/wordpress/trunk@12310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-12-01 22:03:13 +00:00
ryan
1ddec52d4e Fix wpfs root dir location. Props dd32. fixes #11152
git-svn-id: http://svn.automattic.com/wordpress/trunk@12268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-23 21:52:13 +00:00
azaozz
48dded5492 Fix typo, props Harald Nesland, fixes #11002
git-svn-id: http://svn.automattic.com/wordpress/trunk@12152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-06 10:53:41 +00:00
azaozz
bb8c764a52 Add phpdoc and extra filter to file.php, props dd32, fixes #11002
git-svn-id: http://svn.automattic.com/wordpress/trunk@12151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-05 23:03:48 +00:00
ryan
2498bb6cae Bring in wp_handle_upload_prefilter from MU
git-svn-id: http://svn.automattic.com/wordpress/trunk@12142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-11-05 14:24:20 +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
8e3808bce2 Remove trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@11930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-09-14 14:03:32 +00:00
azaozz
ca27f326a9 Add constants for ftp connections timeouts, props dd32, see #10522
git-svn-id: http://svn.automattic.com/wordpress/trunk@11823 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-08-15 12:01:04 +00:00
azaozz
5dc37883b2 Remove dot and silence errors in get_filesystem_method()
git-svn-id: http://svn.automattic.com/wordpress/trunk@11819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-08-15 08:03:48 +00:00
azaozz
468f7aaa14 Strip slashes from POST data in request_filesystem_credentials(), props dd32, fixes #10567
git-svn-id: http://svn.automattic.com/wordpress/trunk@11808 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-08-13 06:03:26 +00:00
azaozz
7842ab84d9 Improve temp file name, props DD32, fixes #10224
git-svn-id: http://svn.automattic.com/wordpress/trunk@11712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-07-14 08:12:18 +00:00
ryan
75c820b140 Enforce stream_get_contents() requirement for ssh2 fs. Props dd32. fixes #10093 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@11632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-06-23 21:54:53 +00:00
ryan
9d293d9f0e Increase download_url() timeout from 30 to 60. see #10104
git-svn-id: http://svn.automattic.com/wordpress/trunk@11587 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-06-16 19:39:31 +00:00
azaozz
e53c5c50f7 Test writability of ABSPATH when upgrading core or WP_PLUGIN_DIR when installing/updating themes and plugins, fixes #9936
git-svn-id: http://svn.automattic.com/wordpress/trunk@11499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-31 21:08:03 +00:00
westi
7a9955a64a Fix plugin/theme upgrade issues when using ftp extension. Fixes #9980 props DD32.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-30 17:14:07 +00:00
ryan
a4a448741e Fix unlink warning. see #9936
git-svn-id: http://svn.automattic.com/wordpress/trunk@11465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-27 00:56:32 +00:00
azaozz
b773a469eb Improve Filesystem method choice for 'direct'; introduce FS_METHOD constant, props DD32, fixes #9936
git-svn-id: http://svn.automattic.com/wordpress/trunk@11454 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-25 10:39:21 +00:00
ryan
2df887bd07 Trim tailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@11450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-24 23:47:49 +00:00
markjaquith
bdf8e8fb38 Use a semantic class name for text targeted to screen readers. props filosofo. fixes #9791
git-svn-id: http://svn.automattic.com/wordpress/trunk@11312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-12 22:40:56 +00:00
ryan
5924293d21 Update upload error strings. Props Askapache. fixes #9625
git-svn-id: http://svn.automattic.com/wordpress/trunk@11304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-12 17:02:34 +00:00
ryan
6f81ec436c Fix hiding off offscreen legends in Firefox. Props Denis-de-Bernardy. fixes #9783
git-svn-id: http://svn.automattic.com/wordpress/trunk@11283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-11 22:11:13 +00:00
westi
51ff5245cf Set empty file type if skipping file type check. Fixes notices when importing. See #9393 props sivel.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-07 06:50:54 +00:00
markjaquith
6c2ffddf31 _a(), _ea(), _xa(), attr() are now esc_attr__(), esc_attr_e(), esc_attr_x(), esc_attr() -- still short, but less cryptic. see #9650
git-svn-id: http://svn.automattic.com/wordpress/trunk@11204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-05 19:43:53 +00:00
azaozz
83f674bf9a Banishing ASCII quotes and apostrophes, props demetris, fixes #9655
git-svn-id: http://svn.automattic.com/wordpress/trunk@11190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-05 04:28:05 +00:00
ryan
14177ba3ef get_home_path() improvements. Props akd907. fixes #9246
git-svn-id: http://svn.automattic.com/wordpress/trunk@11187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-05 02:45:40 +00:00
ryan
808079dc32 Use invisible class for hiding labels and legends.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-04 21:28:58 +00:00
ryan
12078bcb11 Attr escaping
git-svn-id: http://svn.automattic.com/wordpress/trunk@11173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-04 17:54:08 +00:00
westi
c8c528f18e Support single line Template Name comment blocks for theme Templates and apply same cleanup to all header lines. Fixes #8497 props DD32 and Denis-de-Bernardy.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-05-04 09:12:12 +00:00
ryan
2d489767bb s/attribute_escape/attr/. see #9650
git-svn-id: http://svn.automattic.com/wordpress/trunk@11109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-28 05:58:45 +00:00
ryan
857a0563cf SS2 FS fixes. Props DD32. fixes #8210
git-svn-id: http://svn.automattic.com/wordpress/trunk@11063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-22 23:38:01 +00:00
ryan
1cd542a5e2 consolidate plugin/theme/core upgrade/install functions. Props DD32. see #7875
git-svn-id: http://svn.automattic.com/wordpress/trunk@11005 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-04-19 19:36:28 +00:00
ryan
533114e89f Add screen icon for plugin upgrade. Props demetris. fixes #9410
git-svn-id: http://svn.automattic.com/wordpress/trunk@10850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-30 16:26:48 +00:00
ryan
e8b6fe7347 Trim trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@10810 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-03-18 02:43:45 +00:00
westi
cde6596747 Focus on the first blank field when asking for credentials for upgrade/install. Fixes #9061 props rmccue.
git-svn-id: http://svn.automattic.com/wordpress/trunk@10628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-02-22 21:49:48 +00:00
ryan
6e78e3aaf4 Reset port when saving credntials. Props dwenaus and DD32. fixes #8580 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@10198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-12 20:12:16 +00:00
ryan
e89192b1a8 Strip trailing whitespace
git-svn-id: http://svn.automattic.com/wordpress/trunk@10150 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-09 18:03:31 +00:00
azaozz
696e009118 Remove extra screen icons, fixes #8514
git-svn-id: http://svn.automattic.com/wordpress/trunk@10093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-07 01:55:06 +00:00
ryan
535db0f29a Allow override of default file permissions with FS_CHMOD_DIR and FS_CHMOD_FILE. Props DD32. see #8478
git-svn-id: http://svn.automattic.com/wordpress/trunk@10050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-04 21:58:46 +00:00
ryan
6941ef0547 Use binary mode for fopen in download_url()
git-svn-id: http://svn.automattic.com/wordpress/trunk@10048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-04 21:47:45 +00:00
azaozz
a4f2b6960b Fix field labels in file.php, fixes #8456
git-svn-id: http://svn.automattic.com/wordpress/trunk@10018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-12-03 01:43:11 +00:00
ryan
27b2375a4f Fix upload error codes. Props sekundek. fixes #8310
git-svn-id: http://svn.automattic.com/wordpress/trunk@9930 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-27 21:19:12 +00:00
azaozz
f0b7562b48 More screen icons and fixes, includes patch by johnconners, fixes #8380
git-svn-id: http://svn.automattic.com/wordpress/trunk@9912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-26 23:35:23 +00:00
ryan
40c754df1d Unused var fixes. Props DD32. see #8220
git-svn-id: http://svn.automattic.com/wordpress/trunk@9716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-15 18:10:35 +00:00
ryan
9861eb1a85 Notice fixes from DD32. see #7509
git-svn-id: http://svn.automattic.com/wordpress/trunk@9699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-14 23:01:16 +00:00
ryan
778fe45e83 Revert [9523]. fixes #8195 see #7395
git-svn-id: http://svn.automattic.com/wordpress/trunk@9664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-13 18:48:54 +00:00
azaozz
bd2112f197 Store uploads according to the parent post date when using year/month sub-directories
git-svn-id: http://svn.automattic.com/wordpress/trunk@9663 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-13 18:22:00 +00:00
ryan
998dfc44e4 Increase memory limit when unzipping. fixes #8149
git-svn-id: http://svn.automattic.com/wordpress/trunk@9612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-11 19:11:48 +00:00
azaozz
dad2d3b6f1 Add missing "button" class, props Simek, fixes #8067
git-svn-id: http://svn.automattic.com/wordpress/trunk@9527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-05 18:14:22 +00:00
ryan
4a4a04c076 Support installation of plugins living in a subdir in svn. Props DD32. fixes #7395
git-svn-id: http://svn.automattic.com/wordpress/trunk@9523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-05 17:07:45 +00:00
ryan
d0519602a7 IF copy fails, chmod target to 0644 and try again
git-svn-id: http://svn.automattic.com/wordpress/trunk@9493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-03 17:16:41 +00:00
ryan
76edf7888a Remove debug
git-svn-id: http://svn.automattic.com/wordpress/trunk@9460 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-01 06:57:00 +00:00
ryan
843149dfa3 Pass along POST info when requesting credentials
git-svn-id: http://svn.automattic.com/wordpress/trunk@9459 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-11-01 06:56:38 +00:00
ryan
6bcdf328b2 Give downloads a longer timeout. see #7793
git-svn-id: http://svn.automattic.com/wordpress/trunk@9186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-15 16:38:17 +00:00
ryan
97f11e8f42 Report curl errors
git-svn-id: http://svn.automattic.com/wordpress/trunk@9185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-15 16:35:35 +00:00
ryan
19120448af Remove debug
git-svn-id: http://svn.automattic.com/wordpress/trunk@9165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-14 16:37:08 +00:00
ryan
aceef65ba0 Use set_time_limit() to buy some time during upgrade. see #5560
git-svn-id: http://svn.automattic.com/wordpress/trunk@9164 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-14 16:36:43 +00:00
ryan
bb87dcac69 Convert download_url() to http api. Props DD32. see #7793
git-svn-id: http://svn.automattic.com/wordpress/trunk@9142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-10-13 23:41:03 +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
9c89b7fb9e ssh2 fs fixes from ShaneF and DD32. see #7690
git-svn-id: http://svn.automattic.com/wordpress/trunk@8880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-13 18:06:20 +00:00
ryan
231d08add2 Handle ssh keys in ssf2 fs. Props ShaneF. see #7690
git-svn-id: http://svn.automattic.com/wordpress/trunk@8865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-11 17:44:43 +00:00
azaozz
f4bc8da1a7 SSH2 filesystem improvements, props ShaneF, see #7690
git-svn-id: http://svn.automattic.com/wordpress/trunk@8852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-09 03:24:05 +00:00
ryan
d3abd242b0 Don't append HTTPOnly if cookie domain is empty. see #7677
git-svn-id: http://svn.automattic.com/wordpress/trunk@8811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-09-05 05:35:58 +00:00
westi
74b0ab00d2 Add names for attachment templates, fix page template name extraction. See #7576.
git-svn-id: http://svn.automattic.com/wordpress/trunk@8718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-23 09:49:52 +00:00
ryan
35dfa69559 Use WP_CONTENT_PATH to find find files. Props Terragg. fixes #7575 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@8716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-22 22:55:30 +00:00
ryan
35b18e5034 Trailing whitespace cleanup
git-svn-id: http://svn.automattic.com/wordpress/trunk@8600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-09 05:36:14 +00:00
ryan
05305465e4 Automatic upgrade, first cut. see #5560
git-svn-id: http://svn.automattic.com/wordpress/trunk@8595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-08 22:49:35 +00:00
ryan
57e2267904 Fix bad bracketing in unzip_file()
git-svn-id: http://svn.automattic.com/wordpress/trunk@8580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-07 19:15:04 +00:00
westi
35f46f0d4b Plugin Install GSOC project first code drop. Props DD32 see #6015.
git-svn-id: http://svn.automattic.com/wordpress/trunk@8540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-08-04 21:01:09 +00:00
ryan
b42b7b33a7 Image sideloader fix from noel. see #6813
git-svn-id: http://svn.automattic.com/wordpress/trunk@8192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-06-25 16:45:04 +00:00
ryan
22e486c4f8 Delete plugin confirmation from DD32. see #7091
git-svn-id: http://svn.automattic.com/wordpress/trunk@8095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-06-16 18:35:48 +00:00
ryan
f3de02cca6 Use WP_CONTENT_DIR to fix theme editor file loading. Props ionfish. fixes #7097
git-svn-id: http://svn.automattic.com/wordpress/trunk@8053 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-06-05 16:39:20 +00:00
ryan
6aaddbee0a Press This enhancement from noel. see #7066
git-svn-id: http://svn.automattic.com/wordpress/trunk@8048 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-06-04 16:13:55 +00:00
ryan
ffd63e3b33 Make WP_Filesystem work with new directory constants. Props DD32. fixes #7059
git-svn-id: http://svn.automattic.com/wordpress/trunk@8009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-05-29 17:29:32 +00:00
ryan
6c8d35de32 Allow wp-content to exist outside of webroot. Props sambauers. see #6938
git-svn-id: http://svn.automattic.com/wordpress/trunk@7999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-05-27 17:55:24 +00:00
ryan
dcf35ab2ed Add some page template validation
git-svn-id: http://svn.automattic.com/wordpress/trunk@7921 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-05-12 23:51:54 +00:00
ryan
742f09dbc7 Use full path to fs abstraction class. Props DD32. fixes #6912
git-svn-id: http://svn.automattic.com/wordpress/trunk@7895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-05-05 17:06:29 +00:00
ryan
2a8733a159 tempnam workarounds from DD32. see #6465
git-svn-id: http://svn.automattic.com/wordpress/trunk@7840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-04-25 21:34:54 +00:00
ryan
796ae7104e Use error handler instead of die when moving files to upload dir fails. Props simonwheatley. fixes #6450 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@7644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-04-14 16:01:59 +00:00
ryan
3cfb4b406c Return WP_Error from download_url() on HTTP Errors. Fix cases where current plugin filename differs from the WordPress.org slug. Props DD32. see #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@7547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-27 07:36:30 +00:00
ryan
3b9c0f73d5 Enable wpfs auto selection. Props DD32. seee #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@7414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-20 06:08:27 +00:00
ryan
12c62fa4d4 Fix typo in ftpext class. Handle safe mode errors. PRops DD32. see #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@7393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-19 02:46:27 +00:00
ryan
568d64e73e FTP CWD fixes from DD32. see #6245
git-svn-id: http://svn.automattic.com/wordpress/trunk@7327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-16 09:49:10 +00:00
ryan
d1753e67e6 Auto update fixes from DD32. see #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@7238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-11 16:37:44 +00:00
ryan
c506a8173c Fix insert, gallery, sizing, type queries, errors, thumbs, type fallback. Props andy. see #5911
git-svn-id: http://svn.automattic.com/wordpress/trunk@7172 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-06 19:48:54 +00:00
ryan
04c9051a7d Remove trailing whites.
git-svn-id: http://svn.automattic.com/wordpress/trunk@7130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-02 20:17:30 +00:00
ryan
c71d96e269 Plugin updater updates. see #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@7126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-03-01 21:20:23 +00:00
ryan
15c0ccc933 get_temp_dir(). fixes #5984
git-svn-id: http://svn.automattic.com/wordpress/trunk@7058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-02-27 00:47:15 +00:00
ryan
03b47d4ddc Revert [7054]. No idea how I managed that.
git-svn-id: http://svn.automattic.com/wordpress/trunk@7055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-02-27 00:36:33 +00:00
ryan
fb02817dfc Fix users query
git-svn-id: http://svn.automattic.com/wordpress/trunk@7054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-02-27 00:25:08 +00:00
ryan
b8621c5f1e Add new file descriptions for the theme editor. Props SteveAgl. fixes #5897
git-svn-id: http://svn.automattic.com/wordpress/trunk@6892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-02-18 17:05:37 +00:00
ryan
9aab2ce97a First cut at plugin update. Props DD32 for the filesystem abstraction. see #5586
git-svn-id: http://svn.automattic.com/wordpress/trunk@6779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-02-11 05:45:54 +00:00
ryan
1ae1811dd0 Unused var cleanup. Props DD32. see #5418
git-svn-id: http://svn.automattic.com/wordpress/trunk@6551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2008-01-04 19:36:34 +00:00
ryan
5104e0dad0 Extra traversal check.
git-svn-id: http://svn.automattic.com/wordpress/trunk@6520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-12-29 03:14:33 +00:00
ryan
83ccac4372 unique filename fixes from tellyworth. fixes #5482
git-svn-id: http://svn.automattic.com/wordpress/trunk@6401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-12-18 03:32:43 +00:00
ryan
e9c9b1fbf2 Import file attachments. Props tellyworth. fixes #5466
git-svn-id: http://svn.automattic.com/wordpress/trunk@6390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-12-16 21:34:48 +00:00
markjaquith
d3db272764 Properly name files with unknown extensions (for people with unfiltered_upload cap, natch). props Nazgul. fixes #4974 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@6116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-09-14 21:13:23 +00:00
ryan
2f09416258 Trim empty lines. Nothing but newline.
git-svn-id: http://svn.automattic.com/wordpress/trunk@5700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-06-14 02:25:30 +00:00
ryan
e3f7055082 Set eol-style
git-svn-id: http://svn.automattic.com/wordpress/trunk@5566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-05-28 00:04:33 +00:00
matt
0ee4823f71 A helpful pointer for a possible cause of this error.
git-svn-id: http://svn.automattic.com/wordpress/trunk@5565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2007-05-27 22:08:42 +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