cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webform 2.9, fixes profile replacement issues.

Browse Source
This commit is contained in:
espie 2009-11-07 08:35:38 +00:00
parent 87f7e6a73f
commit 097eb686d0
5 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/drupal6/webform/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2009/10/23 10:18:35 espie Exp $
# $OpenBSD: Makefile,v 1.7 2009/11/07 08:35:38 espie Exp $
COMMENT = webform
DISTNAME = webform-6.x-2.8
PKGNAME = drupal6-webform-2.8
DISTNAME = webform-6.x-2.9
PKGNAME = drupal6-webform-2.9
.include <bsd.port.mk>

10
www/drupal6/webform/distinfo
View File

@ -1,5 +1,5 @@
MD5 (drupal6/webform-6.x-2.8.tar.gz) = yQgwah7w7m2SlPeHd3WxdQ==
RMD160 (drupal6/webform-6.x-2.8.tar.gz) = YLjfAf5ddqgQgrDRSq1Tp4ev3JM=
SHA1 (drupal6/webform-6.x-2.8.tar.gz) = w3uipP/H1lYjLKQdk79mZUJhSMw=
SHA256 (drupal6/webform-6.x-2.8.tar.gz) = vdP32oCu/3Mk996i7Hrwkp3Dvk5lvDc4LxudKXdQwmw=
SIZE (drupal6/webform-6.x-2.8.tar.gz) = 265930
MD5 (drupal6/webform-6.x-2.9.tar.gz) = EfxYMBt/HMOJicw5p3tHIg==
RMD160 (drupal6/webform-6.x-2.9.tar.gz) = HnvK9lCdma1f4LLdXRvu/f8aQ+4=
SHA1 (drupal6/webform-6.x-2.9.tar.gz) = VftFUVHpWe0RL4NndEPfGTzvVe8=
SHA256 (drupal6/webform-6.x-2.9.tar.gz) = UOooGrdHB6+FR356UDz49RuTL3EhtKbJBXnjq49uxbc=
SIZE (drupal6/webform-6.x-2.9.tar.gz) = 291979

8
www/drupal6/webform/patches/patch-webform_components_inc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-webform_components_inc,v 1.1 2009/09/20 13:29:33 espie Exp $
--- webform_components.inc.orig Wed Jun 3 21:47:15 2009
+++ webform_components.inc Sun Sep 20 15:26:56 2009
$OpenBSD: patch-webform_components_inc,v 1.2 2009/11/07 08:35:38 espie Exp $
--- webform_components.inc.orig Fri Nov 6 01:25:43 2009
+++ webform_components.inc Sat Nov 7 09:34:41 2009
@@ -187,7 +187,7 @@ function theme_webform_components_form($form) {
// Add each component to a table row.
@ -10,7 +10,7 @@ $OpenBSD: patch-webform_components_inc,v 1.1 2009/09/20 13:29:33 espie Exp $
t($component['type']),
($component['value'] == '') ? '-' : $component['value'],
drupal_render($form['components'][$cid]['mandatory']),
@@ -296,7 +296,6 @@ function webform_component_edit_form($form_state, &$no
@@ -296,7 +296,6 @@ function webform_component_edit_form(&$form_state, $no
'#default_value' => $component['name'],
'#title' => t('Label'),
'#description' => t('This is used as a descriptive label when displaying this form element.'),

21
www/drupal6/webform/patches/patch-webform_module
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-webform_module,v 1.3 2009/10/23 10:18:35 espie Exp $
$OpenBSD: patch-webform_module,v 1.4 2009/11/07 08:35:38 espie Exp $
--- webform.module.orig Thu Oct 15 03:26:46 2009
+++ webform.module Fri Oct 23 12:17:56 2009
@@ -249,6 +249,17 @@ function webform_menu() {
@ -19,22 +19,3 @@ $OpenBSD: patch-webform_module,v 1.3 2009/10/23 10:18:35 espie Exp $
return $items;
}
@@ -2117,6 +2128,7 @@ function theme_webform_mail_headers($form_values, $nod
*/
function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE, $allow_anonymous = FALSE) {
global $user;
+ global $webform_uid_cached;
static $replacements;
// Setup default token replacements.
@@ -2157,8 +2169,9 @@ function _webform_filter_values($string, $node = NULL,
$replacements['unsafe']['%username'] = isset($user->name) ? $user->name : '';
$replacements['unsafe']['%useremail'] = isset($user->mail) ? $user->mail : '';
$replacements['unsafe']['%ip_address'] = ip_address();
- if ($user->uid && module_exists('profile')) {
+ if ($user->uid && module_exists('profile') && $webform_uid_cached != $user->uid) {
profile_load_profile($user);
+ $webform_uid_cached = $user->uid;
}
$special_tokens['unsafe']['%profile'] = $user;

4
www/drupal6/webform/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2009/09/20 13:29:33 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2009/11/07 08:35:38 espie Exp $
@owner ${DRUPAL_OWNER}
@group ${DRUPAL_GROUP}
${DRUPAL_MODS}webform/
@ -32,6 +32,7 @@ ${DRUPAL_MODS}webform/translations/da.po
${DRUPAL_MODS}webform/translations/de.po
${DRUPAL_MODS}webform/translations/el.po
${DRUPAL_MODS}webform/translations/es.po
${DRUPAL_MODS}webform/translations/fi.po
${DRUPAL_MODS}webform/translations/fr.po
${DRUPAL_MODS}webform/translations/he.po
${DRUPAL_MODS}webform/translations/hu.po
@ -41,6 +42,7 @@ ${DRUPAL_MODS}webform/translations/nl.po
${DRUPAL_MODS}webform/translations/ru.po
${DRUPAL_MODS}webform/translations/sk.po
${DRUPAL_MODS}webform/translations/sv.po
${DRUPAL_MODS}webform/translations/uk.po
${DRUPAL_MODS}webform/translations/webform.pot
${DRUPAL_MODS}webform/webform-confirmation.tpl.php
${DRUPAL_MODS}webform/webform-form.tpl.php