Browse Source

removed hard restriction of cache keyPrefix to alnum

fixes #1773
tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
commit
fc6b63717c
  1. 4
      extensions/yii/redis/Session.php
  2. 2
      framework/yii/caching/Cache.php

4
extensions/yii/redis/Session.php

@ -68,8 +68,6 @@ class Session extends \yii\web\Session
* it will use a prefix generated from [[Application::id]]. You may set this property to be an empty string * it will use a prefix generated from [[Application::id]]. You may set this property to be an empty string
* if you don't want to use key prefix. It is recommended that you explicitly set this property to some * if you don't want to use key prefix. It is recommended that you explicitly set this property to some
* static value if the cached data needs to be shared among multiple applications. * static value if the cached data needs to be shared among multiple applications.
*
* To ensure interoperability, only alphanumeric characters should be used.
*/ */
public $keyPrefix; public $keyPrefix;
@ -94,8 +92,6 @@ class Session extends \yii\web\Session
} }
if ($this->keyPrefix === null) { if ($this->keyPrefix === null) {
$this->keyPrefix = substr(md5(Yii::$app->id), 0, 5); $this->keyPrefix = substr(md5(Yii::$app->id), 0, 5);
} elseif (!ctype_alnum($this->keyPrefix)) {
throw new InvalidConfigException(get_class($this) . '::keyPrefix should only contain alphanumeric characters.');
} }
parent::init(); parent::init();
} }

2
framework/yii/caching/Cache.php

@ -82,8 +82,6 @@ abstract class Cache extends Component implements \ArrayAccess
parent::init(); parent::init();
if ($this->keyPrefix === null) { if ($this->keyPrefix === null) {
$this->keyPrefix = substr(md5(Yii::$app->id), 0, 5); $this->keyPrefix = substr(md5(Yii::$app->id), 0, 5);
} elseif (!ctype_alnum($this->keyPrefix)) {
throw new InvalidConfigException(get_class($this) . '::keyPrefix should only contain alphanumeric characters.');
} }
} }

Loading…
Cancel
Save