summaryrefslogtreecommitdiff
path: root/inc/common.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2014-05-18 21:02:24 +0200
committerAndreas Gohr <andi@splitbrain.org>2014-05-18 21:02:24 +0200
commit54b26fbe1e0f9efaba143d88ea8581933f5c8dc8 (patch)
tree02ddfd47a36c16074ef4303ffcf0f892d5fef73a /inc/common.php
parent18496fe0decfb1382393daca3141bf315cda7254 (diff)
parentb2e7cc706ef0f8a622d9973c418cc40e4addc436 (diff)
downloadrpg-54b26fbe1e0f9efaba143d88ea8581933f5c8dc8.tar.gz
rpg-54b26fbe1e0f9efaba143d88ea8581933f5c8dc8.tar.bz2
Merge pull request #720 from splitbrain/newcli
Refactored the CLI stuff
Diffstat (limited to 'inc/common.php')
-rw-r--r--inc/common.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php
index 110b91417..84121fd43 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -797,7 +797,7 @@ function checklock($id) {
//my own lock
@list($ip, $session) = explode("\n", io_readFile($lock));
- if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || $session == session_id()) {
+ if($ip == $INPUT->server->str('REMOTE_USER') || $ip == clientIP() || (session_id() && $session == session_id())) {
return false;
}