Merge remote-tracking branch 'origin/develop' into develop-next

Author: JediKev

README.md

@@ -1,6 +1,6 @@
 osTicket
 ========
-<a href="http://osticket.com"><img src="http://osticket.com/sites/default/files/osTicket.jpg"
+<a href="https://osticket.com"><img height="80px" width="80px" src="images/favicon.png"
 align="left" hspace="10" vspace="6"></a>
 
 **osTicket** is a widely-used open source support ticket system. It seamlessly

images/favicon.png

@@ -25,12 +25,15 @@ function __construct($message) {
         global $ost;
 
         parent::__construct(__($message));
-        $message = str_replace(ROOT_DIR, '(root)/', _S($message));
 
-        if ($ost && $ost->getConfig()->getLogLevel() == 3)
-            $message .= "\n\n" . $this->getBacktrace();
+        if ($ost) {
+            $message = str_replace(ROOT_DIR, '(root)/', _S($message));
 
-        $ost->logError($this->getTitle(), $message, static::$sendAlert);
+            if ($ost->getConfig()->getLogLevel() == 3)
+                $message .= "\n\n" . $this->getBacktrace();
+
+            $ost->logError($this->getTitle(), $message, static::$sendAlert);
+        }
     }
 
     function getTitle() {