diff --git a/framework/Core/lib/Horde/Session.php b/framework/Core/lib/Horde/Session.php
index 804a3cb1d93..08fee53215f 100644
--- a/framework/Core/lib/Horde/Session.php
+++ b/framework/Core/lib/Horde/Session.php
@@ -38,7 +38,6 @@ class Horde_Session
const MODIFIED = '_m'; /* @deprecated */
const PRUNE = '_p';
const REGENERATE = '_r'; /* @since 2.5.0 */
- const VERSION = '_v'; /* @since 2.12.0 */
const TYPE_ARRAY = 1;
const TYPE_OBJECT = 2;
@@ -197,8 +196,6 @@ public function setup($start = true, $cache_limiter = null,
*/
public function start()
{
- global $injector, $registry;
-
/* Limit session ID to 32 bytes. Session IDs are NOT cryptographically
* secure hashes. Instead, they are nothing more than a way to
* generate random strings. */
@@ -209,24 +206,11 @@ public function start()
$this->_active = true;
$this->_data = &$_SESSION;
- try {
- $version = $injector->getInstance('Horde_Core_Hooks')->callHook('session_version', 'horde');
- if (!isset($this->_data[self::VERSION])) {
- $this->_data[self::VERSION] = $version;
- $this->sessionHandler->changed = true;
- } elseif ($version != $this->_data[self::VERSION]) {
- throw new Horde_Exception_AuthenticationFailure(
- 'Session invalidated due to version ID change.',
- Horde_Auth::REASON_SESSION
- );
- }
- } catch (Horde_Exception_HookNotSet $e) {}
-
/* We have reopened a session. Check to make sure that authentication
* status has not changed in the meantime. */
if (!$this->_readonly &&
!is_null($this->_relogin) &&
- (($registry->getAuth() !== false) !== $this->_relogin)) {
+ (($GLOBALS['registry']->getAuth() !== false) !== $this->_relogin)) {
Horde::log('Previous session attempted to be reopened after authentication status change. All session modifications will be ignored.', 'DEBUG');
$this->_readonly = true;
}
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 839596fda87..a44d2119bd3 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -40,7 +40,6 @@
LGPL-2.1
* [mms] Allow jQuery Mobile script to be packaged in same file as other jquery code.
-* [mms] Support session_version Horde hook.
* [mms] Move configuration loading code to Horde_Registry_Loadconfig class.
* [mjr] Fix saving S/MIME signed emails sent via ActiveSync to sent folder (Bug #12936).
* [rla] Add method to get conf.xml defaults when conf.php is present for (Request #12923).
@@ -3304,7 +3303,6 @@
LGPL-2.1
* [mms] Allow jQuery Mobile script to be packaged in same file as other jquery code.
-* [mms] Support session_version Horde hook.
* [mms] Move configuration loading code to Horde_Registry_Loadconfig class.
* [mjr] Fix saving S/MIME signed emails sent via ActiveSync to sent folder (Bug #12936).
* [rla] Add method to get conf.xml defaults when conf.php is present for (Request #12923).
diff --git a/horde/config/hooks.php.dist b/horde/config/hooks.php.dist
index c171d3a7e1f..56934d40550 100644
--- a/horde/config/hooks.php.dist
+++ b/horde/config/hooks.php.dist
@@ -668,20 +668,6 @@ class Horde_Hooks
// }
- /**
- * Define a unique session version identifier that, when changed, will
- * cause all existing (non-matching) sessions to become invalidated when
- * subsequently accessed.
- *
- * @return string Unique session version identifier.
- */
-// public function session_version()
-// {
-// // Example: Sessions become invalidated each week.
-// return date('W-y');
-// }
-
-
/**
* Modify the browser object.
*
diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index 893b077c972..324fcc71291 100644
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -2,7 +2,6 @@
v5.2.0-git
----------
-[mms] Added session_version hook.
[rla] Add modular horde-cli and module for conf.php editing (Request #12923).
[mms] By default, enforce maximum storage size on preferences values.
[mms] Support UglifyJS for compressing javascript.
diff --git a/horde/docs/UPGRADING b/horde/docs/UPGRADING
index d40a7f6ff2a..c2d8a331848 100644
--- a/horde/docs/UPGRADING
+++ b/horde/docs/UPGRADING
@@ -69,11 +69,7 @@ The default value for the following options were changed::
Hooks (hooks.php)
-----------------
-The following hooks have been added::
-
- session_version
-
-New ActiveSync related hooks have been added::
+New ActiveSync related hooks have been added:
activesync_create_device
activesync_device_check
diff --git a/horde/package.xml b/horde/package.xml
index cc1bbc5b147..6e82aa695ab 100644
--- a/horde/package.xml
+++ b/horde/package.xml
@@ -39,7 +39,6 @@
LGPL-2
-* [mms] Added session_version hook.
* [rla] Add modular horde-cli and module for conf.php editing (Request #12923).
* [mms] By default, enforce maximum storage size on preferences values.
* [mms] Support UglifyJS for compressing javascript.