Author: jablko
Date: Thu Oct 29 17:07:16 2009
New Revision: 3850
Log:
Merge -r3836:3849 from trunk
Modified:
branches/dcb/ (props changed)
branches/dcb/apps/qubit/modules/digitalobject/templates/uploadFormSuccess.php
(props changed)
branches/dcb/apps/qubit/modules/repository/templates/autocompleteSuccess.php
(props changed)
branches/dcb/apps/qubit/modules/term/actions/autocompleteAction.class.php
(props changed)
branches/dcb/data/fixtures/acl.yml (props changed)
branches/dcb/lib/form/SettingsOaiRepositoryForm.class.php (props changed)
branches/dcb/lib/vendor/symfony/ (props changed)
branches/dcb/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/actions/deleteAction.class.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/templates/deleteSuccess.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/templates/protectedSuccess.php
(props changed)
branches/dcb/web/vendor/yui/ (props changed)
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/digitalobject/templates/uploadFormSuccess.php
(props changed)
branches/ica-atom/apps/qubit/modules/repository/templates/autocompleteSuccess.php
(props changed)
branches/ica-atom/apps/qubit/modules/term/actions/autocompleteAction.class.php
(props changed)
branches/ica-atom/data/fixtures/acl.yml (props changed)
branches/ica-atom/lib/form/SettingsOaiRepositoryForm.class.php (props
changed)
branches/ica-atom/lib/vendor/symfony/ (props changed)
branches/ica-atom/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/actions/deleteAction.class.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/templates/deleteSuccess.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/templates/protectedSuccess.php
(props changed)
branches/ica-atom/test/selenium/ (props changed)
branches/ica-atom/web/vendor/yui/ (props changed)
Modified: branches/dcb/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
==============================================================================
--- branches/dcb/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
Thu Oct 29 16:49:00 2009 (r3849)
+++ branches/dcb/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
Thu Oct 29 17:07:16 2009 (r3850)
@@ -52,6 +52,10 @@
if (!isset($options['session_cookie_path']))
{
$options['session_cookie_path'] =
sfContext::getInstance()->request->getRelativeUrlRoot();
+ if (1 > strlen($options['session_cookie_path']))
+ {
+ $options['session_cookie_path'] = '/';
+ }
}
$cookieDefaults = session_get_cookie_params();
Modified:
branches/ica-atom/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
==============================================================================
--- branches/ica-atom/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
Thu Oct 29 16:49:00 2009 (r3849)
+++ branches/ica-atom/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
Thu Oct 29 17:07:16 2009 (r3850)
@@ -52,6 +52,10 @@
if (!isset($options['session_cookie_path']))
{
$options['session_cookie_path'] =
sfContext::getInstance()->request->getRelativeUrlRoot();
+ if (1 > strlen($options['session_cookie_path']))
+ {
+ $options['session_cookie_path'] = '/';
+ }
}
$cookieDefaults = session_get_cookie_params();
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
