mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-16 06:31:21 +00:00
Merge branch 'seeddms-4.1.3' into seeddms-4.1.4
This commit is contained in:
commit
d6cfb287a6
|
@ -5,6 +5,7 @@
|
||||||
- fixed typo in variable name which cause a PHP warning when sending the
|
- fixed typo in variable name which cause a PHP warning when sending the
|
||||||
notification mail after updating a folder comment
|
notification mail after updating a folder comment
|
||||||
- fixed code to determine required approver and reviewer
|
- fixed code to determine required approver and reviewer
|
||||||
|
- fixed wrong language setting in installer (Bug #45)
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
Changes in version 4.1.2
|
Changes in version 4.1.2
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
<email>uwe@steinmann.cx</email>
|
<email>uwe@steinmann.cx</email>
|
||||||
<active>yes</active>
|
<active>yes</active>
|
||||||
</lead>
|
</lead>
|
||||||
<date>2013-04-08</date>
|
<date>2013-04-16</date>
|
||||||
<time>16:45:06</time>
|
<time>22:24:26</time>
|
||||||
<version>
|
<version>
|
||||||
<release>4.1.3</release>
|
<release>4.1.3</release>
|
||||||
<api>4.1.0</api>
|
<api>4.1.0</api>
|
||||||
|
|
|
@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
|
||||||
* Load default settings + set
|
* Load default settings + set
|
||||||
*/
|
*/
|
||||||
define("SEEDDMS_INSTALL", "on");
|
define("SEEDDMS_INSTALL", "on");
|
||||||
define("SEEDDMS_VERSION", "4.1.2");
|
define("SEEDDMS_VERSION", "4.1.3");
|
||||||
|
|
||||||
require_once('../inc/inc.ClassSettings.php');
|
require_once('../inc/inc.ClassSettings.php');
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ if(isset($settings->_extraPath))
|
||||||
*/
|
*/
|
||||||
$theme = "blue";
|
$theme = "blue";
|
||||||
include("../inc/inc.Language.php");
|
include("../inc/inc.Language.php");
|
||||||
include "../languages/English/lang.inc";
|
include "../languages/en_GB/lang.inc";
|
||||||
include("../inc/inc.ClassUI.php");
|
include("../inc/inc.ClassUI.php");
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,8 @@ else if ($action == "removegroup") {
|
||||||
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
UI::exitError(getMLText("admin_tools"),getMLText("error_occured"));
|
||||||
}
|
}
|
||||||
|
|
||||||
add_log_line(".php?groupid=".$groupid."&action=removegroup");
|
$groupid = '';
|
||||||
|
add_log_line(".php?groupid=".$_POST["groupid"]."&action=removegroup");
|
||||||
}
|
}
|
||||||
|
|
||||||
//Gruppe bearbeiten -------------------------------------------------------------------------------
|
//Gruppe bearbeiten -------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue
Block a user