diff --git a/include/class.company.php b/include/class.company.php index 2c8758259197c15c5a817005a0346842566796a0..c9aa22f04af3889ea22b564f06ffdf2dff936a71 100644 --- a/include/class.company.php +++ b/include/class.company.php @@ -60,7 +60,11 @@ class Company { } function __toString() { - return $this->getName(); + try { + if ($name = $this->getForm()->getAnswer('name')) + return $name->display(); + } catch (Exception $e) {} + return ''; } /** diff --git a/include/client/footer.inc.php b/include/client/footer.inc.php index 0373eba69622e91483c7675a50344873c2ec1639..e92c7a28269a042a42db6d1dca6dce5a518b4b49 100644 --- a/include/client/footer.inc.php +++ b/include/client/footer.inc.php @@ -1,7 +1,7 @@ </div> </div> <div id="footer"> - <p>Copyright © <?php echo date('Y'); ?> <?php echo $ost->company ?: 'osTicket.com'; ?> - All rights reserved.</p> + <p>Copyright © <?php echo date('Y'); ?> <?php echo (string) $ost->company :? 'osTicket.com'; ?> - All rights reserved.</p> <a id="poweredBy" href="http://osticket.com" target="_blank">Helpdesk software - powered by osTicket</a> </div> <div id="overlay"></div> diff --git a/include/staff/footer.inc.php b/include/staff/footer.inc.php index a77bc0f4a1b2311ccfa8520ea7dbde9eaaada839..5cb94ea3d817be39355871fb783369dedd009cb9 100644 --- a/include/staff/footer.inc.php +++ b/include/staff/footer.inc.php @@ -1,6 +1,6 @@ </div> <div id="footer"> - Copyright © 2006-<?php echo date('Y'); ?> <?php echo $ost->company ?: 'osTicket.com'; ?> All Rights Reserved. + Copyright © 2006-<?php echo date('Y'); ?> <?php echo (string) $ost->company ?: 'osTicket.com'; ?> All Rights Reserved. </div> <?php if(is_object($thisstaff) && $thisstaff->isStaff()) { ?>