~catch-drupal/+junk/pressflow-content-cache-variable

Merge changes from the 6.17 branch that were intended for the mainline.

added added

removed removed

385

// This sets uid 1 (superuser). We skip uid 2 but that's not a big problem.

386

db_query("UPDATE {users} SET uid = 1 WHERE name = '%s'", 'placeholder-for-uid-1');

387

388

db_query("INSERT INTO {role} (rid, name) VALUES (%d, '%s')", DRUPAL_ANONYMOUS_RID, 'anonymous user');

388

db_query("INSERT INTO {role} (name) VALUES ('%s')", 'anonymous user');

389

$rid_anonymous = db_last_insert_id('role', 'rid');

390

391

db_query("INSERT INTO {role} (rid, name) VALUES (%d, '%s')", DRUPAL_AUTHENTICATED_RID, 'authenticated user');

391

db_query("INSERT INTO {role} (name) VALUES ('%s')", 'authenticated user');

392

$rid_authenticated = db_last_insert_id('role', 'rid');

393

394

// Sanity check to ensure the anonymous and authenticated role IDs are the