minor update to 5.9 (session fix was missed was 5.8)

This commit is contained in:
espie 2008-07-26 10:34:01 +00:00
parent 6fc95af145
commit 2bebac304d
4 changed files with 19 additions and 19 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2008/07/24 09:28:40 bernd Exp $
# $OpenBSD: Makefile,v 1.9 2008/07/26 10:34:01 espie Exp $
COMMENT = powerful content management system
DISTNAME = drupal-5.8
PKGNAME= ${DISTNAME}p0
DISTNAME = drupal-5.9
PKGNAME= ${DISTNAME}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
RUN_DEPENDS = ::www/php5/core \

View File

@ -1,5 +1,5 @@
MD5 (drupal5/drupal-5.8.tar.gz) = KlcM48tqEEwsxUCgKjyxHQ==
RMD160 (drupal5/drupal-5.8.tar.gz) = rKNxTm/djg1Lw7fgcHIUSipddyg=
SHA1 (drupal5/drupal-5.8.tar.gz) = jGxGI4nrKgUZA7gp2seXvQbCkZ0=
SHA256 (drupal5/drupal-5.8.tar.gz) = dM3CFyoMgvk37brfIK2ig58EoCrTlRvi7qTQnMogGwM=
SIZE (drupal5/drupal-5.8.tar.gz) = 756306
MD5 (drupal5/drupal-5.9.tar.gz) = KTf9FQPuPSLSMuJZ2DnjFA==
RMD160 (drupal5/drupal-5.9.tar.gz) = EVxw6YZVEpttRrNGDSZKqWp2NBk=
SHA1 (drupal5/drupal-5.9.tar.gz) = OiRoKrznmOKU+mvdtqPo7ziIguE=
SHA256 (drupal5/drupal-5.9.tar.gz) = qqkVyu5w414Dj4x9Oi25XmFU0oxbqfPdCjM7kEno2FY=
SIZE (drupal5/drupal-5.9.tar.gz) = 756520

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-includes_common_inc,v 1.1 2008/03/15 09:36:48 espie Exp $
--- includes/common.inc.orig Tue Jan 22 10:36:49 2008
+++ includes/common.inc Tue Mar 11 10:55:43 2008
@@ -1613,7 +1613,14 @@ function drupal_clear_css_cache() {
$OpenBSD: patch-includes_common_inc,v 1.2 2008/07/26 10:34:01 espie Exp $
--- includes/common.inc.orig Wed Jul 9 21:34:30 2008
+++ includes/common.inc Sat Jul 26 12:28:35 2008
@@ -1618,7 +1618,14 @@ function drupal_clear_css_cache() {
*/
function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer = FALSE, $cache = TRUE) {
if (!is_null($data)) {

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-modules_user_user_module,v 1.1 2008/03/15 09:36:48 espie Exp $
--- modules/user/user.module.orig Sun Feb 17 16:31:26 2008
+++ modules/user/user.module Sun Feb 17 16:55:58 2008
$OpenBSD: patch-modules_user_user_module,v 1.2 2008/07/26 10:34:01 espie Exp $
--- modules/user/user.module.orig Wed Jul 16 21:46:02 2008
+++ modules/user/user.module Sat Jul 26 12:28:35 2008
@@ -321,27 +321,7 @@ function user_validate_picture($file, &$edit, $user) {
* Generate a random alphanumeric password.
*/
@ -30,7 +30,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.1 2008/03/15 09:36:48 espie Exp $
}
/**
@@ -1263,9 +1243,12 @@ function user_register_submit($form_id, $form_values)
@@ -1268,9 +1248,12 @@ function user_register_submit($form_id, $form_values)
return 'user/1/edit';
}
else {
@ -45,7 +45,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.1 2008/03/15 09:36:48 espie Exp $
else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
// No e-mail verification is required, create new user account, and login user immediately.
$subject = _user_mail_text('welcome_subject', $variables);
@@ -1339,6 +1322,7 @@ function user_edit_form($uid, $edit, $register = FALSE
@@ -1344,6 +1327,7 @@ function user_edit_form($uid, $edit, $register = FALSE
'#description' => t('Provide a password for the new account in both fields.'),
'#required' => TRUE,
'#size' => 25,
@ -53,7 +53,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.1 2008/03/15 09:36:48 espie Exp $
);
}
if ($admin) {
@@ -1820,6 +1804,10 @@ function user_admin_perm($rid = NULL) {
@@ -1825,6 +1809,10 @@ function user_admin_perm($rid = NULL) {
while ($role = db_fetch_object($result)) {
$role_names[$role->rid] = $role->name;
}
@ -64,7 +64,7 @@ $OpenBSD: patch-modules_user_user_module,v 1.1 2008/03/15 09:36:48 espie Exp $
// Render role/permission overview:
$options = array();
@@ -1859,7 +1847,12 @@ function theme_user_admin_perm($form) {
@@ -1864,7 +1852,12 @@ function theme_user_admin_perm($form) {
$row = array();
// Module name
if (is_numeric($key)) {