Remove FILE_STATUS_TEMPORARY [#353207]

Attached patch does the following things:

1. Removes FILE_STATUS_TEMPORARY. Because $file->status is a bitmapped field, having FILE_STATUS_TEMPORARY for the 0 value of this field doesn't make sense.
2. Fixes issues with the use of FILE_STATUS_PERMANENT to ensure that it is treated more uniformly as a binary flag.
3. Fixes a logic issue with $file->status in upload.module.

At present all tests still pass.

Comment	File	Size	Author
#1	file_353207.patch	5.91 KB	drewish
#1
	remove-file_status_temp.patch	5.74 KB	CitizenKane

Support from Acquia helps fund testing for Drupal Acquia logo

Comments

Comment #1

drewish CreditAttribution: drewish commented 2 January 2009 at 01:32

Status:

Active

» Needs review

File	Size
file_353207.patch	5.91 KB

Glad you took this up. The whole temporary constant has bothered me for a while but I'd never gotten around to rolling a patch.

I cleaned up the file.inc docs to make it clear what FILE_STATUS_PERMANENT does since FILE_STATUS_TEMPORARY's comment is being removed.

I fiexed the spacing on + $file->status |= FILE_STATUS_PERMANENT; to line up with all the other assignments.

I dropped the changes to system_cron() since the current code is fine.

Comment #2

Dries CreditAttribution: Dries commented 2 January 2009 at 21:46

Status:

Needs review

» Fixed

Good clean-up. Committed to CVS HEAD. Kudos to both.

Comment #3

drewish CreditAttribution: drewish commented 2 January 2009 at 22:35

thanks, added the change to the update docs: http://drupal.org/node/224333#remove_FILE_STATUS_TEMPORARY

Comment #4

Xano

he/they

English

Southampton

CreditAttribution: Xano commented 2 January 2009 at 23:55

I have no experience with bitmap flags (or whatever they're called), but removing FILE_STATUS_TEMPORARY seems very bad for readability from my point of view.

Comment #5

drewish CreditAttribution: drewish commented 3 January 2009 at 00:36

it's less readable but the problem with it was that it didn't really do anything and encouraged people to set the status in a way that would preclude other bits from being used.