Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
227
Merge Requests
227
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
787127df
Commit
787127df
authored
Mar 20, 2011
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Patch
#1089320
by Dave Reid: update version strings and constants to 8.x.
parent
7a8e71e0
Changes
129
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
129 changed files
with
194 additions
and
327 deletions
+194
-327
CHANGELOG.txt
CHANGELOG.txt
+4
-1
MAINTAINERS.txt
MAINTAINERS.txt
+2
-3
UPGRADE.txt
UPGRADE.txt
+18
-19
includes/bootstrap.inc
includes/bootstrap.inc
+2
-2
includes/common.inc
includes/common.inc
+2
-2
includes/update.inc
includes/update.inc
+5
-139
modules/aggregator/aggregator.info
modules/aggregator/aggregator.info
+1
-1
modules/aggregator/tests/aggregator_test.info
modules/aggregator/tests/aggregator_test.info
+1
-1
modules/block/block.info
modules/block/block.info
+1
-1
modules/block/tests/block_test.info
modules/block/tests/block_test.info
+1
-1
modules/blog/blog.info
modules/blog/blog.info
+1
-1
modules/book/book.info
modules/book/book.info
+1
-1
modules/color/color.info
modules/color/color.info
+1
-1
modules/comment/comment.info
modules/comment/comment.info
+1
-1
modules/contact/contact.info
modules/contact/contact.info
+1
-1
modules/contextual/contextual.info
modules/contextual/contextual.info
+1
-1
modules/dashboard/dashboard.info
modules/dashboard/dashboard.info
+1
-1
modules/dblog/dblog.info
modules/dblog/dblog.info
+1
-1
modules/field/field.info
modules/field/field.info
+1
-1
modules/field/modules/field_sql_storage/field_sql_storage.info
...es/field/modules/field_sql_storage/field_sql_storage.info
+1
-1
modules/field/modules/list/list.info
modules/field/modules/list/list.info
+1
-1
modules/field/modules/list/tests/list_test.info
modules/field/modules/list/tests/list_test.info
+1
-1
modules/field/modules/number/number.info
modules/field/modules/number/number.info
+1
-1
modules/field/modules/options/options.info
modules/field/modules/options/options.info
+1
-1
modules/field/modules/text/text.info
modules/field/modules/text/text.info
+1
-1
modules/field/tests/field_test.info
modules/field/tests/field_test.info
+1
-1
modules/field_ui/field_ui.info
modules/field_ui/field_ui.info
+1
-1
modules/file/file.info
modules/file/file.info
+1
-1
modules/file/tests/file_module_test.info
modules/file/tests/file_module_test.info
+1
-1
modules/filter/filter.info
modules/filter/filter.info
+1
-1
modules/forum/forum.info
modules/forum/forum.info
+1
-1
modules/help/help.info
modules/help/help.info
+1
-1
modules/image/image.info
modules/image/image.info
+1
-1
modules/image/tests/image_module_test.info
modules/image/tests/image_module_test.info
+1
-1
modules/locale/locale.info
modules/locale/locale.info
+1
-1
modules/locale/tests/locale_test.info
modules/locale/tests/locale_test.info
+1
-1
modules/menu/menu.info
modules/menu/menu.info
+1
-1
modules/node/node.info
modules/node/node.info
+1
-1
modules/node/tests/node_access_test.info
modules/node/tests/node_access_test.info
+1
-1
modules/node/tests/node_test.info
modules/node/tests/node_test.info
+1
-1
modules/node/tests/node_test_exception.info
modules/node/tests/node_test_exception.info
+1
-1
modules/openid/openid.info
modules/openid/openid.info
+1
-1
modules/openid/tests/openid_test.info
modules/openid/tests/openid_test.info
+1
-1
modules/overlay/overlay.info
modules/overlay/overlay.info
+1
-1
modules/path/path.info
modules/path/path.info
+1
-1
modules/php/php.info
modules/php/php.info
+1
-1
modules/poll/poll.info
modules/poll/poll.info
+1
-1
modules/profile/profile.info
modules/profile/profile.info
+1
-1
modules/rdf/rdf.info
modules/rdf/rdf.info
+1
-1
modules/rdf/tests/rdf_test.info
modules/rdf/tests/rdf_test.info
+1
-1
modules/search/search.info
modules/search/search.info
+1
-1
modules/search/tests/search_embedded_form.info
modules/search/tests/search_embedded_form.info
+1
-1
modules/search/tests/search_extra_type.info
modules/search/tests/search_extra_type.info
+1
-1
modules/shortcut/shortcut.info
modules/shortcut/shortcut.info
+1
-1
modules/simpletest/simpletest.info
modules/simpletest/simpletest.info
+1
-1
modules/simpletest/tests/actions_loop_test.info
modules/simpletest/tests/actions_loop_test.info
+1
-1
modules/simpletest/tests/ajax_forms_test.info
modules/simpletest/tests/ajax_forms_test.info
+1
-1
modules/simpletest/tests/ajax_test.info
modules/simpletest/tests/ajax_test.info
+1
-1
modules/simpletest/tests/batch_test.info
modules/simpletest/tests/batch_test.info
+1
-1
modules/simpletest/tests/common_test.info
modules/simpletest/tests/common_test.info
+1
-1
modules/simpletest/tests/database_test.info
modules/simpletest/tests/database_test.info
+1
-1
modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
...ompatible_test/drupal_system_listing_compatible_test.info
+1
-1
modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.info
...patible_test/drupal_system_listing_incompatible_test.info
+1
-1
modules/simpletest/tests/entity_cache_test.info
modules/simpletest/tests/entity_cache_test.info
+1
-1
modules/simpletest/tests/entity_cache_test_dependency.info
modules/simpletest/tests/entity_cache_test_dependency.info
+1
-1
modules/simpletest/tests/entity_crud_hook_test.info
modules/simpletest/tests/entity_crud_hook_test.info
+1
-1
modules/simpletest/tests/error_test.info
modules/simpletest/tests/error_test.info
+1
-1
modules/simpletest/tests/file_test.info
modules/simpletest/tests/file_test.info
+1
-1
modules/simpletest/tests/filter_test.info
modules/simpletest/tests/filter_test.info
+1
-1
modules/simpletest/tests/form_test.info
modules/simpletest/tests/form_test.info
+1
-1
modules/simpletest/tests/image_test.info
modules/simpletest/tests/image_test.info
+1
-1
modules/simpletest/tests/menu_test.info
modules/simpletest/tests/menu_test.info
+1
-1
modules/simpletest/tests/module_test.info
modules/simpletest/tests/module_test.info
+1
-1
modules/simpletest/tests/module_test.module
modules/simpletest/tests/module_test.module
+1
-1
modules/simpletest/tests/requirements1_test.info
modules/simpletest/tests/requirements1_test.info
+1
-1
modules/simpletest/tests/requirements2_test.info
modules/simpletest/tests/requirements2_test.info
+1
-1
modules/simpletest/tests/session_test.info
modules/simpletest/tests/session_test.info
+1
-1
modules/simpletest/tests/system_dependencies_test.info
modules/simpletest/tests/system_dependencies_test.info
+1
-1
modules/simpletest/tests/system_test.info
modules/simpletest/tests/system_test.info
+1
-1
modules/simpletest/tests/system_test.module
modules/simpletest/tests/system_test.module
+1
-1
modules/simpletest/tests/taxonomy_test.info
modules/simpletest/tests/taxonomy_test.info
+1
-1
modules/simpletest/tests/theme_test.info
modules/simpletest/tests/theme_test.info
+1
-1
modules/simpletest/tests/update_test_1.info
modules/simpletest/tests/update_test_1.info
+1
-1
modules/simpletest/tests/update_test_2.info
modules/simpletest/tests/update_test_2.info
+1
-1
modules/simpletest/tests/update_test_3.info
modules/simpletest/tests/update_test_3.info
+1
-1
modules/simpletest/tests/upgrade/drupal-6.filled.database.php
...les/simpletest/tests/upgrade/drupal-6.filled.database.php
+1
-1
modules/simpletest/tests/url_alter_test.info
modules/simpletest/tests/url_alter_test.info
+1
-1
modules/simpletest/tests/xmlrpc_test.info
modules/simpletest/tests/xmlrpc_test.info
+1
-1
modules/statistics/statistics.info
modules/statistics/statistics.info
+1
-1
modules/syslog/syslog.info
modules/syslog/syslog.info
+1
-1
modules/system/system.info
modules/system/system.info
+1
-1
modules/system/system.queue.inc
modules/system/system.queue.inc
+1
-1
modules/system/system.test
modules/system/system.test
+3
-3
modules/taxonomy/taxonomy.info
modules/taxonomy/taxonomy.info
+1
-1
modules/toolbar/toolbar.info
modules/toolbar/toolbar.info
+1
-1
modules/tracker/tracker.info
modules/tracker/tracker.info
+1
-1
modules/translation/tests/translation_test.info
modules/translation/tests/translation_test.info
+1
-1
modules/translation/translation.info
modules/translation/translation.info
+1
-1
modules/trigger/tests/trigger_test.info
modules/trigger/tests/trigger_test.info
+1
-1
modules/trigger/trigger.info
modules/trigger/trigger.info
+1
-1
modules/update/tests/aaa_update_test.1_0.xml
modules/update/tests/aaa_update_test.1_0.xml
+4
-4
modules/update/tests/aaa_update_test.info
modules/update/tests/aaa_update_test.info
+1
-1
modules/update/tests/bbb_update_test.1_0.xml
modules/update/tests/bbb_update_test.1_0.xml
+4
-4
modules/update/tests/bbb_update_test.info
modules/update/tests/bbb_update_test.info
+1
-1
modules/update/tests/ccc_update_test.1_0.xml
modules/update/tests/ccc_update_test.1_0.xml
+4
-4
modules/update/tests/ccc_update_test.info
modules/update/tests/ccc_update_test.info
+1
-1
modules/update/tests/drupal.0.xml
modules/update/tests/drupal.0.xml
+1
-1
modules/update/tests/drupal.1.xml
modules/update/tests/drupal.1.xml
+1
-1
modules/update/tests/drupal.2-sec.xml
modules/update/tests/drupal.2-sec.xml
+1
-1
modules/update/tests/drupal.dev.xml
modules/update/tests/drupal.dev.xml
+4
-4
modules/update/tests/update_test.info
modules/update/tests/update_test.info
+1
-1
modules/update/tests/update_test_basetheme.1_1-sec.xml
modules/update/tests/update_test_basetheme.1_1-sec.xml
+7
-7
modules/update/tests/update_test_subtheme.1_0.xml
modules/update/tests/update_test_subtheme.1_0.xml
+4
-4
modules/update/update.api.php
modules/update/update.api.php
+2
-2
modules/update/update.info
modules/update/update.info
+1
-1
modules/update/update.test
modules/update/update.test
+15
-15
modules/user/tests/user_form_test.info
modules/user/tests/user_form_test.info
+1
-1
modules/user/user.info
modules/user/user.info
+1
-1
profiles/minimal/minimal.info
profiles/minimal/minimal.info
+1
-1
profiles/standard/standard.info
profiles/standard/standard.info
+1
-1
profiles/testing/modules/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.info
...ompatible_test/drupal_system_listing_compatible_test.info
+1
-1
profiles/testing/testing.info
profiles/testing/testing.info
+1
-1
themes/bartik/bartik.info
themes/bartik/bartik.info
+1
-1
themes/garland/garland.info
themes/garland/garland.info
+1
-1
themes/seven/seven.info
themes/seven/seven.info
+1
-1
themes/stark/stark.info
themes/stark/stark.info
+1
-1
themes/tests/test_theme/test_theme.info
themes/tests/test_theme/test_theme.info
+1
-1
themes/tests/update_test_basetheme/update_test_basetheme.info
...es/tests/update_test_basetheme/update_test_basetheme.info
+1
-1
themes/tests/update_test_subtheme/update_test_subtheme.info
themes/tests/update_test_subtheme/update_test_subtheme.info
+1
-1
No files found.
CHANGELOG.txt
View file @
787127df
Drupal 7.0, xxxx-xx-xx (development version)
Drupal 8.0, xxxx-xx-xx (development version)
----------------------
Drupal 7.0, 2011-01-05
----------------------
- Database:
* Fully rewritten database layer utilizing PHP 5's PDO abstraction layer.
...
...
MAINTAINERS.txt
View file @
787127df
...
...
@@ -10,9 +10,8 @@ particular areas of Drupal. All of them are subject to change.
Branch maintainers
------------------
Drupal
7
Drupal
8
- Dries Buytaert 'dries' <http://drupal.org/user/1>
- Angela Byron 'webchick' <http://drupal.org/user/24967>
Component maintainers
...
...
@@ -126,7 +125,7 @@ Topic coordinators
Accessibility
- Everett Zufelt 'Everett Zufelt' <http://drupal.org/user/406552>
- Brandon Bowersox 'brandonojc' <http://drupal.org/user/186415>
- Brandon Bowersox 'brandonojc' <http://drupal.org/user/186415>
Documentation
- Ariane Khachatourians 'arianek' <http://drupal.org/user/158886>
...
...
UPGRADE.txt
View file @
787127df
...
...
@@ -3,10 +3,10 @@ INTRODUCTION
------------
This document describes how to:
* Update your Drupal site from one minor
7.x version to another minor 7
.x
version; for example, from
7.8 to 7.9, or from 7.6 to 7
.10.
* Update your Drupal site from one minor
8.x version to another minor 8
.x
version; for example, from
8.8 to 8.9, or from 8.6 to 8
.10.
* Upgrade your Drupal site's major version from
6.x to 7
.x.
* Upgrade your Drupal site's major version from
7.x to 8
.x.
First steps and definitions:
...
...
@@ -43,7 +43,7 @@ More in-depth information on upgrading can be found at http://drupal.org/upgrade
MINOR VERSION UPDATES
---------------------
To update from one minor
7.x version of Drupal to any later 7
.x version, after
To update from one minor
8.x version of Drupal to any later 8
.x version, after
following the instructions in the INTRODUCTION section at the top of this file:
1. Log in as a user with the permission "Administer software updates".
...
...
@@ -64,7 +64,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
giving the database name, user, and password) from the old settings.php to
the new settings.php.
4. Download the latest Drupal
7
.x release from http://drupal.org to a
4. Download the latest Drupal
8
.x release from http://drupal.org to a
directory outside of your web root. Extract the archive and copy the files
into your Drupal directory.
...
...
@@ -113,31 +113,31 @@ following the instructions in the INTRODUCTION section at the top of this file:
MAJOR VERSION UPGRADE
---------------------
To upgrade from a previous major version of Drupal to Drupal
7
.x, after
To upgrade from a previous major version of Drupal to Drupal
8
.x, after
following the instructions in the INTRODUCTION section at the top of this file:
1. Check on the Drupal
7
status of your contributed and custom modules and
1. Check on the Drupal
8
status of your contributed and custom modules and
themes. See http://drupal.org/node/948216 for information on upgrading
contributed modules and themes. See http://drupal.org/node/895314 for a list
of modules that have been moved into core for Drupal
7
, and instructions on
of modules that have been moved into core for Drupal
8
, and instructions on
how to update them. See http://drupal.org/update/modules for information on
how to update your custom modules, and http://drupal.org/update/theme for
custom themes.
You may decide at this point that you cannot upgrade your site, because
needed modules or themes are not ready for Drupal
7.
needed modules or themes are not ready for Drupal
8
2. Update to the latest available version of Drupal
6
.x (if your current version
is Drupal
5.x, you have to upgrade to 6
.x first). If you need to update,
download Drupal
6
.x and follow the instructions in its UPGRADE.txt. This
document only applies for upgrades from
6.x to 7
.x.
2. Update to the latest available version of Drupal
7
.x (if your current version
is Drupal
6.x, you have to upgrade to 7
.x first). If you need to update,
download Drupal
7
.x and follow the instructions in its UPGRADE.txt. This
document only applies for upgrades from
7.x to 8
.x.
3. Log in as user ID 1 (the site maintenance user).
4. Go to Administer > Site configuration > Site maintenance. Select
"Off-line" and save the configuration.
5. Go to Administer > Site building > Themes. Enable "
Garland
" and select it as
5. Go to Administer > Site building > Themes. Enable "
Bartik
" and select it as
the default theme.
6. Go to Administer > Site building > Modules. Disable all modules that are not
...
...
@@ -145,7 +145,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
modules cannot be disabled, because others depend on them. Repeat this step
until all non-core modules are disabled.
If you know that you will not re-enable some modules for Drupal
7
.x and you
If you know that you will not re-enable some modules for Drupal
8
.x and you
no longer need their data, then you can uninstall them under the Uninstall
tab after disabling them.
...
...
@@ -161,9 +161,9 @@ following the instructions in the INTRODUCTION section at the top of this file:
9. If you uninstalled any modules, remove them from the sites/all/modules and
other sites/*/modules directories. Leave other modules in place, even though
they are incompatible with Drupal
7
.x.
they are incompatible with Drupal
8
.x.
10. Download the latest Drupal
7
.x release from http://drupal.org to a
10. Download the latest Drupal
8
.x release from http://drupal.org to a
directory outside of your web root. Extract the archive and copy the files
into your Drupal directory.
...
...
@@ -185,7 +185,7 @@ following the instructions in the INTRODUCTION section at the top of this file:
11. Re-apply any modifications to files such as .htaccess or robots.txt.
12. Make your settings.php file writeable, so that the update process can
convert it to the format of Drupal
7
.x. settings.php is usually located in
convert it to the format of Drupal
8
.x. settings.php is usually located in
sites/default/settings.php
...
...
@@ -221,4 +221,3 @@ following the instructions in the INTRODUCTION section at the top of this file:
To get started with Drupal 7 administration, visit
http://drupal.org/getting-started/7/admin
includes/bootstrap.inc
View file @
787127df
...
...
@@ -8,12 +8,12 @@
/**
* The current system version.
*/
define
(
'VERSION'
,
'
7
.0-dev'
);
define
(
'VERSION'
,
'
8
.0-dev'
);
/**
* Core API compatibility.
*/
define
(
'DRUPAL_CORE_COMPATIBILITY'
,
'
7
.x'
);
define
(
'DRUPAL_CORE_COMPATIBILITY'
,
'
8
.x'
);
/**
* Minimum supported version of PHP.
...
...
includes/common.inc
View file @
787127df
...
...
@@ -7166,7 +7166,7 @@ function debug($data, $label = NULL, $print_r = FALSE) {
* Parse a dependency for comparison by drupal_check_incompatibility().
*
* @param $dependency
* A dependency string, for example 'foo (>=
7
.x-4.5-beta5, 3.x)'.
* A dependency string, for example 'foo (>=
8
.x-4.5-beta5, 3.x)'.
* @return
* An associative array with three keys:
* - 'name' includes the name of the thing to depend on (e.g. 'foo').
...
...
@@ -7183,7 +7183,7 @@ function drupal_parse_dependency($dependency) {
// We use named subpatterns and support every op that version_compare
// supports. Also, op is optional and defaults to equals.
$p_op
=
'(?P<operation>!=|==|=|<|<=|>|>=|<>)?'
;
// Core version is always optional:
7
.x-2.x and 2.x is treated the same.
// Core version is always optional:
8
.x-2.x and 2.x is treated the same.
$p_core
=
'(?:'
.
preg_quote
(
DRUPAL_CORE_COMPATIBILITY
)
.
'-)?'
;
$p_major
=
'(?P<major>\d+)'
;
// By setting the minor version to x, branches can be matched.
...
...
includes/update.inc
View file @
787127df
...
...
@@ -9,14 +9,14 @@
*/
/**
* Minimum schema version of Drupal
6 required for upgrade to Drupal 7
.
* Minimum schema version of Drupal
7 required for upgrade to Drupal 8
.
*
* Upgrades from Drupal
6 to Drupal 7 require that Drupal 6
be running
* Upgrades from Drupal
7 to Drupal 8 require that Drupal 7
be running
* the most recent version, or the upgrade could fail. We can't easily
* check the Drupal
6
version once the update process has begun, so instead
* check the Drupal
7
version once the update process has begun, so instead
* we check the schema version of system.module in the system table.
*/
define
(
'REQUIRED_D
6_SCHEMA_VERSION'
,
'6055
'
);
define
(
'REQUIRED_D
7_SCHEMA_VERSION'
,
'7069
'
);
/**
* Disable any items in the {system} table that are not core compatible.
...
...
@@ -145,7 +145,7 @@ function update_prepare_d7_bootstrap() {
// drupal_get_installed_schema_version().
$system_schema
=
drupal_get_installed_schema_version
(
'system'
);
if
(
$system_schema
<
7000
)
{
$has_required_schema
=
$system_schema
>=
REQUIRED_D
6
_SCHEMA_VERSION
;
$has_required_schema
=
$system_schema
>=
REQUIRED_D
7
_SCHEMA_VERSION
;
$requirements
=
array
(
'drupal 6 version'
=>
array
(
'title'
=>
'Drupal 6 version'
,
...
...
@@ -304,140 +304,6 @@ function update_prepare_d7_bootstrap() {
}
}
/**
* A helper function that modules can use to assist with the transformation
* from numeric block deltas to string block deltas during the 6.x -> 7.x
* upgrade.
*
* @todo This function should be removed in 8.x.
*
* @param $sandbox
* An array holding data for the batch process.
* @param $renamed_deltas
* An associative array. Keys are module names, values an associative array
* mapping the old block deltas to the new block deltas for the module.
* Example:
* @code
* $renamed_deltas = array(
* 'mymodule' =>
* array(
* 0 => 'mymodule-block-1',
* 1 => 'mymodule-block-2',
* ),
* );
* @endcode
* @param $moved_deltas
* An associative array. Keys are source module names, values an associative
* array mapping the (possibly renamed) block name to the new module name.
* Example:
* @code
* $moved_deltas = array(
* 'user' =>
* array(
* 'navigation' => 'system',
* ),
* );
* @endcode
*/
function
update_fix_d7_block_deltas
(
&
$sandbox
,
$renamed_deltas
,
$moved_deltas
)
{
// Loop through each block and make changes to the block tables.
// Only run this the first time through the batch update.
if
(
!
isset
(
$sandbox
[
'progress'
]))
{
// Determine whether to use the old or new block table names.
$block_tables
=
db_table_exists
(
'blocks'
)
?
array
(
'blocks'
,
'blocks_roles'
)
:
array
(
'block'
,
'block_role'
);
foreach
(
$block_tables
as
$table
)
{
foreach
(
$renamed_deltas
as
$module
=>
$deltas
)
{
foreach
(
$deltas
as
$old_delta
=>
$new_delta
)
{
// Only do the update if the old block actually exists.
$block_exists
=
db_query
(
"SELECT COUNT(*) FROM {"
.
$table
.
"} WHERE module = :module AND delta = :delta"
,
array
(
':module'
=>
$module
,
':delta'
=>
$old_delta
,
))
->
fetchField
();
if
(
$block_exists
)
{
db_update
(
$table
)
->
fields
(
array
(
'delta'
=>
$new_delta
))
->
condition
(
'module'
,
$module
)
->
condition
(
'delta'
,
$old_delta
)
->
execute
();
}
}
}
foreach
(
$moved_deltas
as
$old_module
=>
$deltas
)
{
foreach
(
$deltas
as
$delta
=>
$new_module
)
{
// Only do the update if the old block actually exists.
$block_exists
=
db_query
(
"SELECT COUNT(*) FROM {"
.
$table
.
"} WHERE module = :module AND delta = :delta"
,
array
(
':module'
=>
$old_module
,
':delta'
=>
$delta
,
))
->
fetchField
();
if
(
$block_exists
)
{
db_update
(
$table
)
->
fields
(
array
(
'module'
=>
$new_module
))
->
condition
(
'module'
,
$old_module
)
->
condition
(
'delta'
,
$delta
)
->
execute
();
}
}
}
}
// Initialize batch update information.
$sandbox
[
'progress'
]
=
0
;
$sandbox
[
'last_user_processed'
]
=
-
1
;
$sandbox
[
'max'
]
=
db_query
(
"SELECT COUNT(*) FROM
{
users
}
WHERE data IS NOT NULL"
)
->
fetchField
();
}
// Now do the batch update of the user-specific block visibility settings.
$limit
=
100
;
$result
=
db_select
(
'users'
,
'u'
)
->
fields
(
'u'
,
array
(
'uid'
,
'data'
))
->
condition
(
'uid'
,
$sandbox
[
'last_user_processed'
],
'>'
)
->
orderBy
(
'uid'
,
'ASC'
)
->
where
(
'data IS NOT NULL'
)
->
range
(
0
,
$limit
)
->
execute
();
foreach
(
$result
as
$row
)
{
$data
=
unserialize
(
$row
->
data
);
$user_needs_update
=
FALSE
;
foreach
(
$renamed_deltas
as
$module
=>
$deltas
)
{
foreach
(
$deltas
as
$old_delta
=>
$new_delta
)
{
if
(
isset
(
$data
[
'block'
][
$module
][
$old_delta
]))
{
// Transfer the old block visibility settings to the newly-renamed
// block, and mark this user for a database update.
$data
[
'block'
][
$module
][
$new_delta
]
=
$data
[
'block'
][
$module
][
$old_delta
];
unset
(
$data
[
'block'
][
$module
][
$old_delta
]);
$user_needs_update
=
TRUE
;
}
}
}
foreach
(
$moved_deltas
as
$old_module
=>
$deltas
)
{
foreach
(
$deltas
as
$delta
=>
$new_module
)
{
if
(
isset
(
$data
[
'block'
][
$old_module
][
$delta
]))
{
// Transfer the old block visibility settings to the moved
// block, and mark this user for a database update.
$data
[
'block'
][
$new_module
][
$delta
]
=
$data
[
'block'
][
$old_module
][
$delta
];
unset
(
$data
[
'block'
][
$old_module
][
$delta
]);
$user_needs_update
=
TRUE
;
}
}
}
// Update the current user.
if
(
$user_needs_update
)
{
db_update
(
'users'
)
->
fields
(
array
(
'data'
=>
serialize
(
$data
)))
->
condition
(
'uid'
,
$row
->
uid
)
->
execute
();
}
// Update our progress information for the batch update.
$sandbox
[
'progress'
]
++
;
$sandbox
[
'last_user_processed'
]
=
$row
->
uid
;
}
// Indicate our current progress to the batch update system.
if
(
$sandbox
[
'progress'
]
<
$sandbox
[
'max'
])
{
$sandbox
[
'#finished'
]
=
$sandbox
[
'progress'
]
/
$sandbox
[
'max'
];
}
}
/**
* Perform Drupal 6.x to 7.x updates that are required for update.php
* to function properly.
...
...
modules/aggregator/aggregator.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Aggregator
description
=
"Aggregates syndicated content (RSS, RDF, and Atom feeds)."
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
aggregator
.
test
configure
=
admin
/
config
/
services
/
aggregator
/
settings
stylesheets
[
all
][]
=
aggregator
.
css
modules/aggregator/tests/aggregator_test.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = "Aggregator module tests"
description
=
"Support module for aggregator related testing."
package
=
Testing
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
hidden
=
TRUE
modules/block/block.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Block
description
=
Controls
the
visual
building
blocks
a
page
is
constructed
with
.
Blocks
are
boxes
of
content
rendered
into
an
area
,
or
region
,
of
a
web
page
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
block
.
test
configure
=
admin
/
structure
/
block
modules/block/tests/block_test.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = Block test
description
=
Provides
test
blocks
.
package
=
Testing
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
hidden
=
TRUE
modules/blog/blog.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = Blog
description
=
Enables
multi
-
user
blogs
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
blog
.
test
modules/book/book.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Book
description
=
Allows
users
to
create
and
organize
related
content
in
an
outline
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
book
.
test
configure
=
admin
/
content
/
book
/
settings
stylesheets
[
all
][]
=
book
.
css
modules/color/color.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = Color
description
=
Allows
administrators
to
change
the
color
scheme
of
compatible
themes
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
color
.
test
modules/comment/comment.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Comment
description
=
Allows
users
to
comment
on
and
discuss
published
content
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
text
files
[]
=
comment
.
module
files
[]
=
comment
.
test
...
...
modules/contact/contact.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Contact
description
=
Enables
the
use
of
both
personal
and
site
-
wide
contact
forms
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
contact
.
test
configure
=
admin
/
structure
/
contact
modules/contextual/contextual.info
View file @
787127df
...
...
@@ -2,4 +2,4 @@ name = Contextual links
description
=
Provides
contextual
links
to
perform
actions
related
to
elements
on
a
page
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
modules/dashboard/dashboard.info
View file @
787127df
name
=
Dashboard
description
=
Provides
a
dashboard
page
in
the
administrative
interface
for
organizing
administrative
tasks
and
tracking
information
within
your
site
.
core
=
7
.
x
core
=
8
.
x
package
=
Core
version
=
VERSION
files
[]
=
dashboard
.
test
...
...
modules/dblog/dblog.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = Database logging
description
=
Logs
and
records
system
events
to
the
database
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
dblog
.
test
modules/field/field.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Field
description
=
Field
API
to
add
fields
to
entities
like
nodes
and
users
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
field
.
module
files
[]
=
field
.
attach
.
inc
files
[]
=
tests
/
field
.
test
...
...
modules/field/modules/field_sql_storage/field_sql_storage.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Field SQL storage
description
=
Stores
field
data
in
an
SQL
database
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
field_sql_storage
.
test
required
=
TRUE
modules/field/modules/list/list.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = List
description
=
Defines
list
field
types
.
Use
with
Options
to
create
selection
lists
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
dependencies
[]
=
options
files
[]
=
tests
/
list
.
test
modules/field/modules/list/tests/list_test.info
View file @
787127df
name
=
"List test"
description
=
"Support module for the List module tests."
core
=
7
.
x
core
=
8
.
x
package
=
Testing
version
=
VERSION
hidden
=
TRUE
modules/field/modules/number/number.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Number
description
=
Defines
numeric
field
types
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
number
.
test
modules/field/modules/options/options.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Options
description
=
Defines
selection
,
check
box
and
radio
button
widgets
for
text
and
numeric
fields
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
options
.
test
modules/field/modules/text/text.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Text
description
=
Defines
simple
text
field
types
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
text
.
test
required
=
TRUE
modules/field/tests/field_test.info
View file @
787127df
name
=
"Field API Test"
description
=
"Support module for the Field API tests."
core
=
7
.
x
core
=
8
.
x
package
=
Testing
files
[]
=
field_test
.
entity
.
inc
version
=
VERSION
...
...
modules/field_ui/field_ui.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Field UI
description
=
User
interface
for
the
Field
API
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
field_ui
.
test
modules/file/file.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = File
description
=
Defines
a
file
field
type
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
field
files
[]
=
tests
/
file
.
test
modules/file/tests/file_module_test.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = File test
description
=
Provides
hooks
for
testing
File
module
functionality
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
hidden
=
TRUE
modules/filter/filter.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Filter
description
=
Filters
content
in
preparation
for
display
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
filter
.
test
required
=
TRUE
configure
=
admin
/
config
/
content
/
formats
modules/forum/forum.info
View file @
787127df
...
...
@@ -4,7 +4,7 @@ dependencies[] = taxonomy
dependencies
[]
=
comment
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
forum
.
test
configure
=
admin
/
structure
/
forum
stylesheets
[
all
][]
=
forum
.
css
modules/help/help.info
View file @
787127df
...
...
@@ -2,5 +2,5 @@ name = Help
description
=
Manages
the
display
of
online
help
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
help
.
test
modules/image/image.info
View file @
787127df
...
...
@@ -2,7 +2,7 @@ name = Image
description
=
Provides
image
manipulation
tools
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
dependencies
[]
=
file
files
[]
=
image
.
test
configure
=
admin
/
config
/
media
/
image
-
styles
modules/image/tests/image_module_test.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Image test
description
=
Provides
hook
implementations
for
testing
Image
module
functionality
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
image_module_test
.
module
hidden
=
TRUE
modules/locale/locale.info
View file @
787127df
...
...
@@ -2,6 +2,6 @@ name = Locale
description
=
Adds
language
handling
functionality
and
enables
the
translation
of
the
user
interface
to
languages
other
than
English
.
package
=
Core
version
=
VERSION
core
=
7
.
x
core
=
8
.
x
files
[]
=
locale
.
test
configure
=
admin
/
config
/
regional
/
language
modules/locale/tests/locale_test.info
View file @
787127df
name
=
"Locale Test"
description
=
"Support module for the locale layer tests."
core
=
7
.
x
core
=
8
.
x
package
=
Testing