wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for _m() usage with context in StatusNet main code.

Browse Source
This commit is contained in:
Brion Vibber 2010-03-13 12:12:06 -08:00
parent d2c4ff5f7c
commit 14c488ebb0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/language.php
View File

@ -202,16 +202,19 @@ function _mdomain($backtrace)
static $cached; static $cached;
$path = $backtrace[0]['file']; $path = $backtrace[0]['file'];
if (!isset($cached[$path])) { if (!isset($cached[$path])) {
$final = 'statusnet'; // assume default domain
if (DIRECTORY_SEPARATOR !== '/') { if (DIRECTORY_SEPARATOR !== '/') {
$path = strtr($path, DIRECTORY_SEPARATOR, '/'); $path = strtr($path, DIRECTORY_SEPARATOR, '/');
} }
$cut = strpos($path, '/plugins/') + 9; $cut = strpos($path, '/plugins/');
$cut2 = strpos($path, '/', $cut); if ($cut) {
if ($cut && $cut2) { $cut += strlen('/plugins/');
$cached[$path] = substr($path, $cut, $cut2 - $cut); $cut2 = strpos($path, '/', $cut);
} else { if ($cut && $cut2) {
return null; $final = substr($path, $cut, $cut2 - $cut);
}
} }
$cached[$path] = $final;
} }
return $cached[$path]; return $cached[$path];
} }