diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 14:18:32 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-08 14:18:32 +0100 |
| commit | 73023bc12b81a27045703e1f733faeb2b4e02cec (patch) | |
| tree | 14aca1a1953d0a813c06794e48a63738abccdcea /app/layout/layout.phtml | |
| parent | 26da4aa448906f857a252507b34d369a386043c6 (diff) | |
| parent | 0e4e16ac55097aa173c7c439367294ebd7645562 (diff) | |
Merge branch 'dev' into 252-extensions
Conflicts:
app/FreshRSS.php
app/Models/Configuration.php
app/views/index/index.phtml
app/views/index/normal.phtml
lib/Minz/Configuration.php
lib/Minz/Translate.php
lib/lib_rss.php
Diffstat (limited to 'app/layout/layout.phtml')
| -rw-r--r-- | app/layout/layout.phtml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 1827d6c26..083ffd4b3 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html lang="<?php echo FreshRSS_Context::$conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$conf->language; ?>"> +<html lang="<?php echo FreshRSS_Context::$user_conf->language; ?>" xml:lang="<?php echo FreshRSS_Context::$user_conf->language; ?>"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="initial-scale=1.0" /> @@ -34,7 +34,7 @@ <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>"> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> - <meta name="apple-mobile-web-app-title" content="<?php echo Minz_Configuration::title(); ?>"> + <meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>"> <meta name="msapplication-TileColor" content="#FFF" /> <meta name="robots" content="noindex,nofollow" /> </head> |