gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 13:42:04 +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-05-02 18:33:37 +02:00
commit d0118f9b9d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/inc.ClassSession.php
View File

@ -105,7 +105,7 @@ class SeedDMS_Session {
$this->data = $data; $this->data = $data;
$this->data['id'] = $id; $this->data['id'] = $id;
$this->data['lastaccess'] = $lastaccess; $this->data['lastaccess'] = $lastaccess;
$this->data['su'] = $su; $this->data['su'] = 0;
$this->data['clipboard'] = array('docs'=>array(), 'folders'=>array()); $this->data['clipboard'] = array('docs'=>array(), 'folders'=>array());
return $id; return $id;
} /* }}} */ } /* }}} */

6
inc/inc.Language.php
View File

@ -74,8 +74,10 @@ function getMLText($key, $replace = array(), $defaulttext = "", $lang="") { /* {
if(!isset($LANG[$lang][$key])) { if(!isset($LANG[$lang][$key])) {
if (!$defaulttext) { if (!$defaulttext) {
$tmpText = $LANG[$settings->_language][$key]; if(isset($LANG[$settings->_language][$key]))
// return "Error getting Text: " . $key . " (" . $lang . ")"; $tmpText = $LANG[$settings->_language][$key];
else
$tmpText = '';
} else } else
$tmpText = $defaulttext; $tmpText = $defaulttext;
} else } else