Several more constants rewritten to getConfig()

[mailer.git] / inc / libs / cache_functions.php

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index 53e4847e901fb0526959b214b132ba8674e953d0..7cfc987a874948bcabb366755672de9898a41cfe 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -105,7 +105,7 @@ class CacheSystem {
                $this->inc = $this->path . $cacheName . $this->extension;
 
                // Construct FQFN (full qualified file name)
-               $this->fqfn = constant('PATH') . $this->inc;
+               $this->fqfn = getConfig('PATH') . $this->inc;
 
                // Check if file exists and if version matches
                $status = ($this->isCacheReadable() && (is_writeable($this->fqfn)) && ($this->extensionVersionMatches('cache')));
@@ -221,7 +221,7 @@ class CacheSystem {
                        }
                } else {
                        // Cache file not found or not readable
-                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_LOAD_1.$this->fqfn.CACHE_CANNOT_LOAD_2);
+                       addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_LOAD', $this->fqfn)));
                }
        }
 
@@ -273,7 +273,7 @@ class CacheSystem {
                                $this->rebuilt[$this->name] = true;
                        } else {
                                // Not removed!
-                               addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".CACHE_CANNOT_UNLINK_1.$this->fqfn.CACHE_CANNOT_UNLINK_2);
+                               addFatalMessage(__METHOD__, __LINE__, "(<font color=\"#0000aa\">".__LINE__."</font>): ".sprintf(getMessage('CACHE_CANNOT_UNLINK', $this->fqfn)));
                        }
                } // END - if
        }