[Pkg-drupal-commits] r1874 - in /branches/upstream/current-5: ./ includes/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/drupal/ modules/filter/ modules/forum/ modules/help/ modules/legacy/ modules/locale/ modules/menu/ modules/node/ modules/path/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/upload/ modules/user/ modules/watchdog/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Tue Feb 12 10:40:00 UTC 2008
Author: luigi
Date: Tue Feb 12 10:40:00 2008
New Revision: 1874
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1874
Log:
[svn-upgrade] Integrating new upstream version, drupal5 (5.7)
Modified:
branches/upstream/current-5/.htaccess
branches/upstream/current-5/CHANGELOG.txt
branches/upstream/current-5/includes/common.inc
branches/upstream/current-5/modules/aggregator/aggregator.info
branches/upstream/current-5/modules/block/block.info
branches/upstream/current-5/modules/blog/blog.info
branches/upstream/current-5/modules/blogapi/blogapi.info
branches/upstream/current-5/modules/book/book.info
branches/upstream/current-5/modules/color/color.info
branches/upstream/current-5/modules/comment/comment.info
branches/upstream/current-5/modules/contact/contact.info
branches/upstream/current-5/modules/drupal/drupal.info
branches/upstream/current-5/modules/filter/filter.info
branches/upstream/current-5/modules/filter/filter.module
branches/upstream/current-5/modules/forum/forum.info
branches/upstream/current-5/modules/help/help.info
branches/upstream/current-5/modules/legacy/legacy.info
branches/upstream/current-5/modules/locale/locale.info
branches/upstream/current-5/modules/menu/menu.info
branches/upstream/current-5/modules/node/node.info
branches/upstream/current-5/modules/path/path.info
branches/upstream/current-5/modules/ping/ping.info
branches/upstream/current-5/modules/poll/poll.info
branches/upstream/current-5/modules/profile/profile.info
branches/upstream/current-5/modules/search/search.info
branches/upstream/current-5/modules/statistics/statistics.info
branches/upstream/current-5/modules/system/system.info
branches/upstream/current-5/modules/system/system.install
branches/upstream/current-5/modules/system/system.module
branches/upstream/current-5/modules/taxonomy/taxonomy.info
branches/upstream/current-5/modules/throttle/throttle.info
branches/upstream/current-5/modules/tracker/tracker.info
branches/upstream/current-5/modules/upload/upload.info
branches/upstream/current-5/modules/user/user.info
branches/upstream/current-5/modules/watchdog/watchdog.info
Modified: branches/upstream/current-5/.htaccess
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/.htaccess?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/.htaccess (original)
+++ branches/upstream/current-5/.htaccess Tue Feb 12 10:40:00 2008
@@ -78,13 +78,19 @@
#
# To redirect all users to access the site WITHOUT the 'www.' prefix,
# (http://www.example.com/... will be redirected to http://example.com/...)
- # adapt and uncomment the following:
+ # uncomment and adapt the following:
# RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC]
# RewriteRule ^(.*)$ http://example.com/$1 [L,R=301]
- # Modify the RewriteBase if you are using Drupal in a subdirectory and
- # the rewrite rules are not working properly.
- #RewriteBase /drupal
+ # Modify the RewriteBase if you are using Drupal in a subdirectory or in a
+ # VirtualDocumentRoot and the rewrite rules are not working properly.
+ # For example if your site is at http://example.com/drupal uncomment and
+ # modify the following line:
+ # RewriteBase /drupal
+ #
+ # If your site is running in a VirtualDocumentRoot at http://example.com/,
+ # uncomment the following line:
+ # RewriteBase /
# Rewrite old-style URLs of the form 'node.php?id=x'.
#RewriteCond %{REQUEST_FILENAME} !-f
@@ -104,4 +110,4 @@
RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
</IfModule>
-# $Id: .htaccess,v 1.81.2.3 2007/09/21 12:24:22 drumm Exp $
+# $Id: .htaccess,v 1.81.2.4 2008/01/22 09:01:39 drumm Exp $
Modified: branches/upstream/current-5/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/CHANGELOG.txt?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/CHANGELOG.txt (original)
+++ branches/upstream/current-5/CHANGELOG.txt Tue Feb 12 10:40:00 2008
@@ -1,4 +1,9 @@
-// $Id: CHANGELOG.txt,v 1.173.2.17 2008/01/10 22:14:24 drumm Exp $
+// $Id: CHANGELOG.txt,v 1.173.2.19 2008/01/29 00:00:44 drumm Exp $
+
+Drupal 5.7, 2008-01-28
+----------------------
+- fixed the input format configuration page.
+- fixed a variety of small bugs.
Drupal 5.6, 2008-01-10
----------------------
Modified: branches/upstream/current-5/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/includes/common.inc?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/includes/common.inc (original)
+++ branches/upstream/current-5/includes/common.inc Tue Feb 12 10:40:00 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.611.2.14 2007/12/27 09:21:23 drumm Exp $
+// $Id: common.inc,v 1.611.2.15 2008/01/22 09:36:49 drumm Exp $
/**
* @file
@@ -554,7 +554,7 @@
}
if ($errno & (E_ALL ^ E_NOTICE)) {
- $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning');
+ $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning', 4096 => 'recoverable fatal error');
$entry = $types[$errno] .': '. $message .' in '. $filename .' on line '. $line .'.';
// Force display of error messages in update.php
Modified: branches/upstream/current-5/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/aggregator/aggregator.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-5/modules/aggregator/aggregator.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/block/block.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/block/block.info (original)
+++ branches/upstream/current-5/modules/block/block.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blog/blog.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blog/blog.info (original)
+++ branches/upstream/current-5/modules/blog/blog.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/blogapi/blogapi.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-5/modules/blogapi/blogapi.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/book/book.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/book/book.info (original)
+++ branches/upstream/current-5/modules/book/book.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/color/color.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/color/color.info (original)
+++ branches/upstream/current-5/modules/color/color.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/comment/comment.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/comment/comment.info (original)
+++ branches/upstream/current-5/modules/comment/comment.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/contact/contact.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/contact/contact.info (original)
+++ branches/upstream/current-5/modules/contact/contact.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/drupal/drupal.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/drupal/drupal.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/drupal/drupal.info (original)
+++ branches/upstream/current-5/modules/drupal/drupal.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/filter/filter.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.info (original)
+++ branches/upstream/current-5/modules/filter/filter.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/filter/filter.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/filter/filter.module?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/filter/filter.module (original)
+++ branches/upstream/current-5/modules/filter/filter.module Tue Feb 12 10:40:00 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.160.2.5 2008/01/10 22:14:24 drumm Exp $
+// $Id: filter.module,v 1.160.2.6 2008/01/22 08:43:34 drumm Exp $
/**
* @file
@@ -604,8 +604,9 @@
if (!empty($form)) {
$form = system_settings_form($form);
- $form['format'] = array('#type' => 'hidden', '#value' => $format->format);
- $form['#submit'][] = 'filter_admin_configure_submit';
+ $form['format'] = array('#type' => 'hidden', '#value' => $format);
+ $form['#submit']['system_settings_form_submit'] = array();
+ $form['#submit']['filter_admin_configure_submit'] = array();
}
else {
$form['error'] = array('#value' => t('No settings are available.'));
Modified: branches/upstream/current-5/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/forum/forum.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/forum/forum.info (original)
+++ branches/upstream/current-5/modules/forum/forum.info Tue Feb 12 10:40:00 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/help/help.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/help/help.info (original)
+++ branches/upstream/current-5/modules/help/help.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/legacy/legacy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/legacy/legacy.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/legacy/legacy.info (original)
+++ branches/upstream/current-5/modules/legacy/legacy.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/locale/locale.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/locale/locale.info (original)
+++ branches/upstream/current-5/modules/locale/locale.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/menu/menu.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/menu/menu.info (original)
+++ branches/upstream/current-5/modules/menu/menu.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/node/node.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/node/node.info (original)
+++ branches/upstream/current-5/modules/node/node.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/path/path.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/path/path.info (original)
+++ branches/upstream/current-5/modules/path/path.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/ping/ping.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/ping/ping.info (original)
+++ branches/upstream/current-5/modules/ping/ping.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/poll/poll.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/poll/poll.info (original)
+++ branches/upstream/current-5/modules/poll/poll.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/profile/profile.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/profile/profile.info (original)
+++ branches/upstream/current-5/modules/profile/profile.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/search/search.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/search/search.info (original)
+++ branches/upstream/current-5/modules/search/search.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/statistics/statistics.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/statistics/statistics.info (original)
+++ branches/upstream/current-5/modules/statistics/statistics.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.info (original)
+++ branches/upstream/current-5/modules/system/system.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/system/system.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.install?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.install (original)
+++ branches/upstream/current-5/modules/system/system.install Tue Feb 12 10:40:00 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: system.install,v 1.69.2.9 2008/01/10 22:14:24 drumm Exp $
+// $Id: system.install,v 1.69.2.10 2008/01/22 09:42:01 drumm Exp $
define('DRUPAL_MINIMUM_PHP', '4.3.5');
define('DRUPAL_MINIMUM_MYSQL', '3.23.17'); // If using MySQL
@@ -39,9 +39,24 @@
$requirements['php']['description'] = $t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP));
$requirements['php']['severity'] = REQUIREMENT_ERROR;
}
- if (ini_get('register_globals')) {
- $requirements['php']['description'] = $t('<em>register_globals</em> is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when <em>register_globals</em> is enabled. The PHP manual has instructions for <a href="http://php.net/configuration.changes">how to change configuration settings</a>.');
- $requirements['php']['severity'] = REQUIREMENT_ERROR;
+
+ // Test PHP register_globals setting.
+ $requirements['php_register_globals'] = array(
+ 'title' => $t('PHP register globals'),
+ );
+ $register_globals = trim(ini_get('register_globals'));
+ // Unfortunately, ini_get() may return many different values, and we can't
+ // be certain which values mean 'on', so we instead check for 'not off'
+ // since we never want to tell the user that their site is secure
+ // (register_globals off), when it is in fact on. We can only guarantee
+ // register_globals is off if the value returned is 'off', '', or 0.
+ if (!empty($register_globals) && strtolower($register_globals) != 'off') {
+ $requirements['php_register_globals']['description'] = $t('<em>register_globals</em> is enabled. Drupal requires this configuration directive to be disabled. Your site may not be secure when <em>register_globals</em> is enabled. The PHP manual has instructions for <a href="http://php.net/configuration.changes">how to change configuration settings</a>.');
+ $requirements['php_register_globals']['severity'] = REQUIREMENT_ERROR;
+ $requirements['php_register_globals']['value'] = $t("Enabled ('@value')", array('@value' => $register_globals));
+ }
+ else {
+ $requirements['php_register_globals']['value'] = $t('Disabled');
}
// Test DB version
Modified: branches/upstream/current-5/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/system/system.module?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/system/system.module (original)
+++ branches/upstream/current-5/modules/system/system.module Tue Feb 12 10:40:00 2008
@@ -1,12 +1,12 @@
<?php
-// $Id: system.module,v 1.440.2.27 2008/01/10 22:14:24 drumm Exp $
+// $Id: system.module,v 1.440.2.29 2008/01/29 00:00:44 drumm Exp $
/**
* @file
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '5.6');
+define('VERSION', '5.7');
/**
* Implementation of hook_help().
Modified: branches/upstream/current-5/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/taxonomy/taxonomy.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-5/modules/taxonomy/taxonomy.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/throttle/throttle.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/throttle/throttle.info (original)
+++ branches/upstream/current-5/modules/throttle/throttle.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/tracker/tracker.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/tracker/tracker.info (original)
+++ branches/upstream/current-5/modules/tracker/tracker.info Tue Feb 12 10:40:00 2008
@@ -5,8 +5,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/upload/upload.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/upload/upload.info (original)
+++ branches/upstream/current-5/modules/upload/upload.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - optional
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/user/user.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/user/user.info (original)
+++ branches/upstream/current-5/modules/user/user.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
Modified: branches/upstream/current-5/modules/watchdog/watchdog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-5/modules/watchdog/watchdog.info?rev=1874&op=diff
==============================================================================
--- branches/upstream/current-5/modules/watchdog/watchdog.info (original)
+++ branches/upstream/current-5/modules/watchdog/watchdog.info Tue Feb 12 10:40:00 2008
@@ -4,8 +4,8 @@
package = Core - required
version = VERSION
-; Information added by drupal.org packaging script on 2008-01-10
-version = "5.6"
+; Information added by drupal.org packaging script on 2008-01-29
+version = "5.7"
project = "drupal"
-datestamp = "1200003604"
+datestamp = "1201565404"
More information about the Pkg-drupal-commits
mailing list