Merge https://github.com/friendica/red into pending_merge

2014-11-03 14:51:28 -08:00
parent a6d8c3193a 9984ff37e5
commit fdb9b9d52e
5 changed files with 101 additions and 93 deletions
--- a/include/session.php
+++ b/include/session.php
@@ -84,8 +84,9 @@ function ref_session_destroy ($id) {

 function ref_session_gc($expire) {
  q("DELETE FROM session WHERE expire < %d", dbesc(time()));
-  q("OPTIMIZE TABLE session");
-  return true;
+    if (! get_config('system','innodb'))
+        q("OPTIMIZE TABLE session");
+    return true;
 }

 $gc_probability = 50;