From 24625933313891b12d198b84c1d6f42d041fd3d7 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 30 Jan 2015 09:07:09 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/dns/dns_dkim_edit.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/interface/web/dns/dns_dkim_edit.php b/interface/web/dns/dns_dkim_edit.php
old mode 100755
new mode 100644
index eac7cb6..1a01463
--- a/interface/web/dns/dns_dkim_edit.php
+++ b/interface/web/dns/dns_dkim_edit.php
@@ -108,6 +108,7 @@
if (!empty($this->dataRecord['data'])) {
$this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
$this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
+ $this->dataRecord['ttl']=60;
}
// Update the serial number and timestamp of the RR record
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
--
Gitblit v1.9.1