From f34ccef158ecf7d3bc5b01f0f4db5d6a107c3691 Mon Sep 17 00:00:00 2001
From: Tobias Hintze
Date: Wed, 11 Sep 2013 08:27:40 +0200
Subject: [PATCH] OC_Util::generate_random_bytes was camelCased in master check
function existence instead of branching away for stable5
---
lib/session.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/session.php b/lib/session.php
index ac700027..dc998234 100644
--- a/lib/session.php
+++ b/lib/session.php
@@ -135,7 +135,13 @@ class Session extends Db{
protected static function getUniqueSessionId(){
do {
- $id = \OC_Util::generate_random_bytes(30);
+ // this prevents branching for stable5 for now:
+ // OC_Util::generate_random_bytes was camelCased
+ if (method_exists('\OC_Util', 'generate_random_bytes')) {
+ $id = \OC_Util::generate_random_bytes(30);
+ } else {
+ $id = \OC_Util::generateRandomBytes(30);
+ }
} while (self::getSession($id));
return $id;
|