Skip to content

Commit

Permalink
July 30, 2009. Commit #245012 by Dries at 14:32
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Doherty authored and Benjamin Doherty committed Jul 30, 2009
1 parent cd43df9 commit 6a6811f
Show file tree
Hide file tree
Showing 184 changed files with 5,042 additions and 2,704 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// $Id: CHANGELOG.txt,v 1.317 2009/07/21 07:09:46 webchick Exp $
// $Id: CHANGELOG.txt,v 1.322 2009/07/30 08:28:47 dries Exp $

Drupal 7.0, xxxx-xx-xx (development version)
----------------------
Expand Down Expand Up @@ -73,6 +73,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
* If your site is being upgraded from Drupal 6 and you do not have the
contributed date or event modules installed, user time zone settings will
fallback to the system time zone and will have to be reconfigured by each user.
- Filter system:
* Refactored the HTML corrector to take advantage of PHP 5 features.
- Removed ping module:
* Contributed modules with similar functionality are available.
- Refactored the "access rules" component of user module:
Expand All @@ -93,6 +95,7 @@ Drupal 7.0, xxxx-xx-xx (development version)
on as contributed themes (http://drupal.org/project/bluemarine,
http://drupal.org/project/chameleon and http://drupal.org/project/pushbutton).
* Added Stark theme to make analyzing Drupal's default HTML and CSS easier.
* Added Slate theme as the default administration interface theme.
- File handling:
* Files are now first class Drupal objects with file_load(), file_save(),
and file_validate() functions and corresponding hooks.
Expand All @@ -103,6 +106,9 @@ Drupal 7.0, xxxx-xx-xx (development version)
uploading a site logo--that don't require the overhead of databases and
hooks, the current unmanaged copy, move and delete operations have been
preserved but renamed to file_unmanaged_*().
* Rewrote file handling to use PHP stream wrappers to enable support for
both public and private files and to support pluggable storage mechanisms
and access to remote resources (e.g. S3 storage or Flickr photos).
- Image handling:
* Improved image handling, including better support for add-on image
libraries.
Expand All @@ -121,6 +127,9 @@ Drupal 7.0, xxxx-xx-xx (development version)
and allow custom data fields to be attached to itself.
* Provides a subset of the features of the Content Construction
Kit (CCK) module.
- Installer:
* Refactored the installer into an API that allows Drupal to be installed
via a command line script.
- Page organization
* Made the help text area a full featured region with blocks.
* Site mission is replaced with the highlighted content block region and
Expand All @@ -137,6 +146,8 @@ Drupal 7.0, xxxx-xx-xx (development version)
* Upgraded the jQuery Forms library to 2.21.
* Added jQuery UI 1.7.2, which allows improvements to Drupal's user
experience.
- Better module version support.
* Modules now can specify which version of another module they depend on.

Drupal 6.0, 2008-02-13
----------------------
Expand Down
32 changes: 16 additions & 16 deletions CVS/Entries
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ D/profiles////
D/scripts////
D/sites////
D/themes////
/.htaccess/1.103/Sun Jun 21 18:46:09 2009//
/CHANGELOG.txt/1.317/Thu Jul 23 09:32:12 2009//
/COPYRIGHT.txt/1.4/Fri Jun 12 07:15:24 2009//
/INSTALL.mysql.txt/1.11/Fri Jun 12 07:15:24 2009//
/INSTALL.pgsql.txt/1.7/Fri Jun 12 07:15:24 2009//
/INSTALL.sqlite.txt/1.1/Fri Jun 12 07:15:24 2009//
/INSTALL.txt/1.73/Thu Jul 23 09:32:13 2009//
/LICENSE.txt/1.7/Fri Jun 12 07:15:24 2009//
/MAINTAINERS.txt/1.30/Fri Jun 12 07:15:24 2009//
/UPGRADE.txt/1.14/Fri Jun 12 07:15:24 2009//
/cron.php/1.42/Fri Jun 12 07:15:24 2009//
/index.php/1.98/Sun Jun 14 04:46:49 2009//
/install.php/1.186/Thu Jul 23 09:32:13 2009//
/robots.txt/1.13/Fri Jun 12 07:15:27 2009//
/update.php/1.292/Thu Jul 23 09:28:47 2009//
/xmlrpc.php/1.17/Fri Jun 12 07:15:28 2009//
/.htaccess/1.103/Thu Jul 30 21:08:47 2009//
/CHANGELOG.txt/1.322/Thu Jul 30 21:12:36 2009//
/COPYRIGHT.txt/1.4/Thu Jul 30 21:08:47 2009//
/INSTALL.mysql.txt/1.11/Thu Jul 30 21:08:47 2009//
/INSTALL.pgsql.txt/1.8/Thu Jul 30 21:12:36 2009//
/INSTALL.sqlite.txt/1.1/Thu Jul 30 21:08:47 2009//
/INSTALL.txt/1.73/Thu Jul 30 21:08:47 2009//
/LICENSE.txt/1.7/Thu Jul 30 21:08:47 2009//
/MAINTAINERS.txt/1.30/Thu Jul 30 21:08:47 2009//
/UPGRADE.txt/1.14/Thu Jul 30 21:08:47 2009//
/cron.php/1.42/Thu Jul 30 21:08:47 2009//
/index.php/1.98/Thu Jul 30 21:08:47 2009//
/install.php/1.190/Thu Jul 30 21:12:37 2009//
/robots.txt/1.13/Thu Jul 30 21:08:48 2009//
/update.php/1.293/Thu Jul 30 21:12:37 2009//
/xmlrpc.php/1.17/Thu Jul 30 21:08:48 2009//
10 changes: 5 additions & 5 deletions INSTALL.pgsql.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// $Id: INSTALL.pgsql.txt,v 1.7 2007/11/26 16:36:42 dries Exp $
// $Id: INSTALL.pgsql.txt,v 1.8 2009/07/27 19:42:54 dries Exp $

CREATE THE PostgreSQL DATABASE
------------------------------
Expand All @@ -12,9 +12,9 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
following command creates a new user named "username" and asks for a
password for that user:

createuser --pwprompt --encrypted --no-adduser --no-createdb username
createuser --pwprompt --encrypted --no-createrole --no-createdb username

If everything works correctly, you'll see a "CREATE USER" notice.
If there are no errors then the command was successful

2. CREATE THE DRUPAL DATABASE

Expand All @@ -23,6 +23,6 @@ Note that the database must be created with UTF-8 (Unicode) encoding.
The following command creates a new database named "databasename", which is
owned by previously created "username":

createdb --encoding=UNICODE --owner=username databasename
createdb --encoding=UTF8 --owner=username databasename

If everything works correctly, you'll see a "CREATE DATABASE" notice.
If there are no errors then the command was successful
62 changes: 32 additions & 30 deletions includes/CVS/Entries
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
D/database////
D/filetransfer////
/actions.inc/1.29/Thu Jul 23 09:32:13 2009//
/batch.inc/1.36/Sat Jun 13 03:09:33 2009//
/bootstrap.inc/1.291/Thu Jul 23 09:32:13 2009//
/cache-install.inc/1.2/Fri Jun 12 07:15:24 2009//
/cache.inc/1.38/Fri Jul 3 03:59:24 2009//
/common.inc/1.938/Thu Jul 23 09:32:13 2009//
/file.inc/1.177/Thu Jul 23 09:32:13 2009//
/file.mimetypes.inc/1.3/Thu Jul 23 09:32:13 2009//
/form.inc/1.352/Thu Jul 23 09:32:13 2009//
/graph.inc/1.2/Fri Jun 12 07:15:24 2009//
/image.inc/1.33/Fri Jun 12 07:15:24 2009//
/install.inc/1.98/Thu Jul 23 09:32:13 2009//
/iso.inc/1.3/Fri Jun 12 07:15:24 2009//
/language.inc/1.19/Fri Jun 12 07:15:24 2009//
/locale.inc/1.220/Thu Jul 23 09:32:13 2009//
/mail.inc/1.20/Fri Jun 12 07:15:24 2009//
/menu.inc/1.330/Thu Jul 23 09:28:47 2009//
/module.inc/1.147/Thu Jul 23 09:28:47 2009//
/pager.inc/1.67/Fri Jun 12 07:15:24 2009//
/password.inc/1.6/Fri Jun 12 07:15:24 2009//
/path.inc/1.42/Thu Jul 23 09:32:13 2009//
/registry.inc/1.18/Sun Jun 14 04:52:25 2009//
/session.inc/1.70/Fri Jul 3 03:59:25 2009//
/tablesort.inc/1.51/Sat Jun 13 03:09:57 2009//
/theme.inc/1.499/Thu Jul 23 09:28:47 2009//
/theme.maintenance.inc/1.32/Thu Jul 23 09:28:47 2009//
/unicode.entities.inc/1.2/Fri Jun 12 07:15:24 2009//
/unicode.inc/1.39/Sat Jun 13 03:09:59 2009//
/xmlrpc.inc/1.58/Tue Jun 16 00:53:18 2009//
/xmlrpcs.inc/1.28/Sat Jun 13 03:10:00 2009//
/actions.inc/1.29/Thu Jul 30 21:08:47 2009//
/batch.inc/1.36/Thu Jul 30 21:08:47 2009//
/bootstrap.inc/1.292/Thu Jul 30 21:12:37 2009//
/cache-install.inc/1.3/Thu Jul 30 21:12:37 2009//
/cache.inc/1.38/Thu Jul 30 21:08:47 2009//
/common.inc/1.949/Thu Jul 30 21:12:37 2009//
/file.inc/1.178/Thu Jul 30 21:12:37 2009//
/file.mimetypes.inc/1.3/Thu Jul 30 21:08:47 2009//
/form.inc/1.354/Thu Jul 30 21:12:37 2009//
/graph.inc/1.3/Thu Jul 30 21:12:37 2009//
/image.inc/1.33/Thu Jul 30 21:08:47 2009//
/install.inc/1.103/Thu Jul 30 21:12:37 2009//
/iso.inc/1.4/Thu Jul 30 21:12:37 2009//
/language.inc/1.19/Thu Jul 30 21:08:47 2009//
/locale.inc/1.221/Thu Jul 30 21:12:37 2009//
/mail.inc/1.20/Thu Jul 30 21:08:47 2009//
/menu.inc/1.331/Thu Jul 30 21:12:37 2009//
/module.inc/1.149/Thu Jul 30 21:12:37 2009//
/pager.inc/1.68/Thu Jul 30 21:12:37 2009//
/password.inc/1.6/Thu Jul 30 21:08:47 2009//
/path.inc/1.43/Thu Jul 30 21:12:37 2009//
/registry.inc/1.19/Thu Jul 30 21:12:37 2009//
/session.inc/1.70/Thu Jul 30 21:08:47 2009//
/stream_wrappers.inc/1.1/Mon Jul 27 19:53:17 2009//
/tablesort.inc/1.51/Thu Jul 30 21:08:47 2009//
/theme.inc/1.501/Thu Jul 30 21:12:37 2009//
/theme.maintenance.inc/1.32/Thu Jul 30 21:08:47 2009//
/unicode.entities.inc/1.2/Thu Jul 30 21:08:47 2009//
/unicode.inc/1.39/Thu Jul 30 21:08:47 2009//
/update.inc/1.1/Wed Jul 29 05:59:59 2009//
/xmlrpc.inc/1.58/Thu Jul 30 21:08:47 2009//
/xmlrpcs.inc/1.28/Thu Jul 30 21:08:47 2009//
71 changes: 69 additions & 2 deletions includes/bootstrap.inc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
// $Id: bootstrap.inc,v 1.291 2009/07/22 04:45:35 dries Exp $
// $Id: bootstrap.inc,v 1.292 2009/07/28 12:13:46 dries Exp $

/**
* @file
Expand Down Expand Up @@ -390,6 +390,66 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
return $conf;
}

/**
* Set appropriate server variables needed for command line scripts to work.
*
* This function can be called by command line scripts before bootstrapping
* Drupal, to ensure that the page loads with the desired server parameters.
* This is because many parts of Drupal assume that they are running in a web
* browser and therefore use information from the global PHP $_SERVER variable
* that does not get set when Drupal is run from the command line.
*
* In many cases, the default way in which this function populates the $_SERVER
* variable is sufficient, and it can therefore be called without passing in
* any input. However, command line scripts running on a multisite installation
* (or on any installation that has settings.php stored somewhere other than
* the sites/default folder) need to pass in the URL of the site to allow
* Drupal to detect the correct location of the settings.php file. Passing in
* the 'url' parameter is also required for functions like request_uri() to
* return the expected values.
*
* Most other parameters do not need to be passed in, but may be necessary in
* some cases; for example, if Drupal's ip_address() function needs to return
* anything but the standard localhost value ('127.0.0.1'), the command line
* script should pass in the desired value via the 'REMOTE_ADDR' key.
*
* @param $variables
* (optional) An associative array of variables within $_SERVER that should
* be replaced. If the special element 'url' is provided in this array, it
* will be used to populate some of the server defaults; it should be set to
* the URL of the current page request, excluding any $_GET request but
* including the script name (e.g., http://www.example.com/mysite/index.php).
*
* @see conf_path()
* @see request_uri()
* @see ip_address()
*/
function drupal_override_server_variables($variables = array()) {
// Set defaults based on the provided URL.
if (isset($variables['url'])) {
$url = parse_url($variables['url']);
unset($variables['url']);
}
else {
$url = array();
}
$url += array(
'path' => '',
'host' => 'localhost',
);
$defaults = array(
'HTTP_HOST' => $url['host'],
'SCRIPT_NAME' => $url['path'],
'REMOTE_ADDR' => '127.0.0.1',
'REQUEST_METHOD' => 'GET',
'SERVER_NAME' => NULL,
'SERVER_SOFTWARE' => 'PHP CLI',
'HTTP_USER_AGENT' => NULL,
);
// Replace elements of the $_SERVER array, as appropriate.
$_SERVER = $variables + $_SERVER + $defaults;
}

/**
* Initialize PHP environment.
*/
Expand Down Expand Up @@ -1487,6 +1547,13 @@ function drupal_maintenance_theme() {
_drupal_maintenance_theme();
}

/**
* Return TRUE if a Drupal installation is currently being attempted.
*/
function drupal_installation_attempted() {
return defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install';
}

/**
* Return the name of the localization function. Use in code that needs to
* run both during installation and normal operation.
Expand All @@ -1496,7 +1563,7 @@ function get_t() {
// This is not converted to drupal_static because there is no point in
// resetting this as it can not change in the course of a request.
if (!isset($t)) {
$t = function_exists('install_main') ? 'st' : 't';
$t = drupal_installation_attempted() ? 'st' : 't';
}
return $t;
}
Expand Down
6 changes: 5 additions & 1 deletion includes/cache-install.inc
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
// $Id: cache-install.inc,v 1.2 2007/08/07 08:39:35 goba Exp $
// $Id: cache-install.inc,v 1.3 2009/07/28 12:13:46 dries Exp $

/**
* A stub cache implementation to be used during the installation
Expand All @@ -15,6 +15,10 @@ function cache_get($key, $table = 'cache') {
return FALSE;
}

function cache_get_multiple(array &$cids, $bin = 'cache') {
return array();
}

function cache_set($cid, $data, $table = 'cache', $expire = CACHE_PERMANENT, $headers = NULL) {
return;
}
Expand Down
Loading

0 comments on commit 6a6811f

Please sign in to comment.