Revision 1927
Added by darkviper over 11 years ago
| branches/2.8.x/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
=============================================================================== |
| 13 | 13 |
|
| 14 |
10 Jun-2013 Build 1927 Werner v.d.Decken(DarkViper) |
|
| 15 |
# TranslateAdaptorWbOldStyle forgotten second arg for trim added |
|
| 14 | 16 |
10 Jun-2013 Build 1926 Werner v.d.Decken(DarkViper) |
| 15 | 17 |
! TranslateAdaptorWbOldStyle now also accepts modified admin directory names |
| 16 | 18 |
09 Jun-2013 Build 1925 Werner v.d.Decken(DarkViper) |
| branches/2.8.x/wb/admin/interface/version.php | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) |
| 53 | 53 |
if(!defined('VERSION')) define('VERSION', '2.8.3');
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1926');
|
|
| 54 |
if(!defined('REVISION')) define('REVISION', '1927');
|
|
| 55 | 55 |
if(!defined('SP')) define('SP', '');
|
| branches/2.8.x/wb/framework/TranslateAdaptorWbOldStyle.php | ||
|---|---|---|
| 44 | 44 |
public function __construct($sAddon = '') |
| 45 | 45 |
{
|
| 46 | 46 |
$this->sAddon = $sAddon; |
| 47 |
$this->sFilePath = str_replace('\\', '/', dirname(dirname(__FILE__)).'/'.$sAddon);
|
|
| 48 | 47 |
} |
| 49 | 48 |
/** |
| 50 | 49 |
* Load languagefile |
| ... | ... | |
| 103 | 102 |
$this->sFilePath = $sDirname.$sAddon.'/languages/'; |
| 104 | 103 |
if(!is_readable($this->sFilePath) && (strpos('admin', $this->sAddon) === 0)) {
|
| 105 | 104 |
// correct modified admin directory |
| 106 |
$sTmp = trim(WbAdaptor::getInstance()->AcpDir); |
|
| 105 |
$sTmp = trim(WbAdaptor::getInstance()->AcpDir, '/');
|
|
| 107 | 106 |
$this->sFilePath = $sDirname.preg_replace('/^admin/', $sTmp, $sAddon).'/languages/';
|
| 108 | 107 |
if(!is_readable($this->sFilePath)) {
|
| 109 | 108 |
throw new TranslationException('missing language definitions in: '.$sAddon.'/languages');
|
Also available in: Unified diff
TranslateAdaptorWbOldStyle forgotten second arg for trim added