gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2015-07-06 22:18:23 +02:00
commit 84a1879c85
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
op/op.EditDocument.php
View File

@ -180,8 +180,8 @@ if (($oldcomment = $document->getComment()) != $comment) {
}
$expires = false;
if (isset($_POST["expires"]) && $_POST["expires"] != "false") {
if($_POST["expdate"]) {
if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
if(isset($_POST["expdate"]) && $_POST["expdate"]) {
$tmp = explode('-', $_POST["expdate"]);
$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
} else {

2
views/bootstrap/class.SetExpires.php
View File

@ -58,7 +58,7 @@ class SeedDMS_View_SetExpires extends SeedDMS_Bootstrap_Style {
<td><?php printMLText("expires");?>:</td>
<td>
<span class="input-append date span12" id="expirationdate" data-date="<?php echo $expdate; ?>" data-date-format="dd-mm-yyyy" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span4" size="16" name="expdate" type="text" value="<?php echo $expdate; ?>">
<input class="span6" name="expdate" type="text" value="<?php echo $expdate; ?>">
<span class="add-on"><i class="icon-calendar"></i></span>
</span><br />
<label class="checkbox inline">