Fixed bug #7700: Fatal error if caching is disabled and locking enabled (follow-up...
authorOliver Hader <oliver.hader@typo3.org>
Thu, 28 Feb 2008 09:54:20 +0000 (09:54 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Thu, 28 Feb 2008 09:54:20 +0000 (09:54 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3314 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_lock.php
typo3/sysext/cms/tslib/class.tslib_fe.php

index 1539821..7b92f20 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-02-28  Oliver Hader  <oh@inpublica.de>
 
        * Fixed bug #7630: Several problems with locking API (t3lib_lock)
+       * Fixed bug #7700: Fatal error if caching is disabled and locking enabled (follow-up on bug #7630)
 
 2008-02-27  Stanislas Rolland  <stanislas.rolland@fructifor.ca>
 
index 726c7d4..b0737fe 100644 (file)
@@ -215,7 +215,7 @@ class t3lib_lock {
                                unlink($this->resource);
                        break;
                        case 'semaphore':
-                               if (sem_release($this->resource)) {
+                               if (@sem_release($this->resource)) {
                                        sem_remove($this->resource);
                                } else {
                                        $success = false;
index 23c11b4..b680586 100755 (executable)
@@ -2734,7 +2734,7 @@ require_once (PATH_t3lib.'class.t3lib_lock.php');
         */
        function acquirePageGenerationLock(&$lockObj, $key)     {
                if ($this->no_cache || $this->headerNoCache()) {
-                       $lockObj->sysLog('Page is not cached, no locking required');
+                       t3lib_div::sysLog('Locking: Page is not cached, no locking required', 'cms', 0);
                        return true;    // No locking is needed if caching is disabled
                }