|
@@ -214,10 +214,10 @@ discard block |
|
|
block discarded – undo |
|
214
|
214
|
*/ |
|
215
|
215
|
protected function getTheDefaultPrefix() |
|
216
|
216
|
{ |
|
217
|
|
- return (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '') . '_' . |
|
218
|
|
- (isset($_SERVER['THEME']) ? $_SERVER['THEME'] : '') . '_' . |
|
219
|
|
- (isset($_SERVER['STAGE']) ? $_SERVER['STAGE'] : '') . '_' . |
|
220
|
|
- (isset($_SESSION['language']) ? $_SESSION['language'] : '') . '_' . |
|
|
217
|
+ return (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '').'_'. |
|
|
218
|
+ (isset($_SERVER['THEME']) ? $_SERVER['THEME'] : '').'_'. |
|
|
219
|
+ (isset($_SERVER['STAGE']) ? $_SERVER['STAGE'] : '').'_'. |
|
|
220
|
+ (isset($_SESSION['language']) ? $_SESSION['language'] : '').'_'. |
|
221
|
221
|
(isset($_SESSION['language_extra']) ? $_SESSION['language_extra'] : ''); |
|
222
|
222
|
} |
|
223
|
223
|
|
|
@@ -395,7 +395,7 @@ discard block |
|
|
block discarded – undo |
|
395
|
395
|
*/ |
|
396
|
396
|
private function calculateStoreKey($rawKey) |
|
397
|
397
|
{ |
|
398
|
|
- $str = $this->getPrefix() . $rawKey; |
|
|
398
|
+ $str = $this->getPrefix().$rawKey; |
|
399
|
399
|
|
|
400
|
400
|
if ($this->adapter instanceof AdapterFile) { |
|
401
|
401
|
$str = $this->cleanStoreKey($str); |
Please login to merge, or discard this patch.