Merge branch 'bug-413' into bug-1138 bug-1138
authorBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 16:58:04 +0000 (18:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 6 Jun 2014 16:58:04 +0000 (18:58 +0200)
Conflicts:
pages/account/12.php
pages/account/5.php

1  2 
pages/account/12.php
pages/account/5.php

                        UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
                        UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
                        `domaincerts`.`expire`,
 -                      `revoked` as `revoke`,
 +                      `domaincerts`.`revoked` as `revoke`,
-                       UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
+                       UNIX_TIMESTAMP(`revoked`) as `revoked`,
+                       if (`domaincerts`.`expire`=0,CURRENT_TIMESTAMP(),`domaincerts`.`modified`) as `modified`,
+                       `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
                        `domaincerts`.`description`
                        from `domaincerts`,`domains`
                        where `memid`='".intval($_SESSION['profile']['id'])."' and `domaincerts`.`domid`=`domains`.`id` ";
Simple merge