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

Merge branch 'develop' into hooks

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-30 20:01:38 +02:00
commit c0c9aaa61c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -5,6 +5,7 @@
- expiration date cannot be set for the version as indicated by the gui. - expiration date cannot be set for the version as indicated by the gui.
I was always set for the document, but this was not clear from the I was always set for the document, but this was not clear from the
gui. gui.
- reorganization of ViewDocument page
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.2.1 Changes in version 4.2.1

3
inc/inc.Settings.php
View File

@ -70,4 +70,7 @@ if (isset($settingsOLD)) {
if(isset($settings->_extraPath)) if(isset($settings->_extraPath))
ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
if(isset($settings->_maxExecutionTime))
ini_set('max_execution_time', $settings->_maxExecutionTime);
?> ?>

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

@ -1102,7 +1102,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
} }
print "</td>\n"; print "</td>\n";
print "<td>\n"; print "<td>\n";
print "<a href=\"../op/op.RemoveFromClipboard.php?folderid=".$this->params['folder']->getID()."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a>"; print "<div class=\"list-action\"><a href=\"../op/op.RemoveFromClipboard.php?folderid=".$this->params['folder']->getID()."&id=".$docid."&type=document\" title=\"".getMLText('rm_from_clipboard')."\"><i class=\"icon-remove\"></i></a></div>";
print "</td>\n"; print "</td>\n";
print "</tr>"; print "</tr>";
} }