Skip to content

Commit

Permalink
more php7 compatability fixes for depricated constructors.
Browse files Browse the repository at this point in the history
Fix for #217.
  • Loading branch information
Peter Adams committed Dec 20, 2016
1 parent 610cfd1 commit 2f413b4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
7 changes: 3 additions & 4 deletions includes/template_class.php
Expand Up @@ -55,9 +55,8 @@ class Template {
*
* @access public
*/
function Template() {
function __construct() {

return;
}

/**
Expand Down Expand Up @@ -129,8 +128,8 @@ class CachedTemplate extends Template {
* @param $cache_id string unique cache identifier
* @param $expire int number of seconds the cache will live
*/
function CachedTemplate($cache_id = null, $expire = 900) {
$this->Template();
function __construct($cache_id = null, $expire = 900) {
parent::__construct();
$this->cache_id = $cache_id ? 'cache/' . md5($cache_id) : $cache_id;
$this->expire = $expire;
}
Expand Down
6 changes: 2 additions & 4 deletions modules/base/classes/widget.php
Expand Up @@ -177,11 +177,9 @@ function getMetric($name) {

class owa_widgetView extends owa_view {

function owa_widgetView() {
function __construct() {

$this->owa_view();

return;
return parent::__construct();
}

function render($data) {
Expand Down
2 changes: 1 addition & 1 deletion modules/base/templates/options_general.tpl
Expand Up @@ -85,7 +85,7 @@

<div class="setting" id="p3p_policy">
<div class="title">P3P Compact Privacy Policy</div>
<div class="description">This setting controls the P3P compact privacy policy that is returned to the browser when OWA sets cookies. Click <a href="http://www.p3pwriter.com/LRN_111.asp">here</a> for more information on compact privacy policies and choosing the right one for your web site.</div>
<div class="description">This setting controls the P3P compact privacy policy that is returned to the browser when OWA sets cookies. Click <a href="https://www.w3.org/P3P/">here</a> for more information on compact privacy policies and choosing the right one for your web site.</div>
<div class="field"><input type="text" size="50" name="<?php echo $this->getNs();?>config[base.p3p_policy]" value="<?php $this->out( $config['p3p_policy'] );?>"></div>
</div>

Expand Down

0 comments on commit 2f413b4

Please sign in to comment.