diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-22 06:50:47 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-22 06:50:47 +0100 |
| commit | 767b4f30f7ee114b1cfd66e68fa959ac033b5667 (patch) | |
| tree | 6df1045c07a3297d6e43550e37dda43d0ac925d2 /boot.php | |
| parent | 8fbde780b37e3d5eeb2ee672a3474b3701eb9645 (diff) | |
| parent | ee11a74d0b7cff5061a4d498f8ecd15e55b91b07 (diff) | |
| download | volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.tar.gz volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.tar.bz2 volse-hubzilla-767b4f30f7ee114b1cfd66e68fa959ac033b5667.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2,9 +2,9 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.922' ); +define ( 'FRIENDIKA_VERSION', '2.1.925' ); define ( 'DFRN_PROTOCOL_VERSION', '2.1' ); -define ( 'DB_UPDATE_VERSION', 1043 ); +define ( 'DB_UPDATE_VERSION', 1044 ); define ( 'EOL', "<br />\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1862,11 +1862,11 @@ function format_like($cnt,$arr,$type,$id) { if(! function_exists('load_view_file')) { function load_view_file($s) { + global $lang; + if(! isset($lang)) + $lang = 'en'; $b = basename($s); $d = dirname($s); - $lang = get_config('system','language'); - if($lang === false) - $lang = 'en'; if(file_exists("$d/$lang/$b")) return file_get_contents("$d/$lang/$b"); return file_get_contents($s); |