rev update
This commit is contained in:
parent
816db4396a
commit
dec5298248
5 changed files with 824 additions and 244 deletions
2
boot.php
2
boot.php
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1492' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1496' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1156 );
|
||||
|
||||
|
|
|
@ -448,7 +448,7 @@ function admin_page_site(&$a) {
|
|||
|
||||
'$baseurl' => $a->get_baseurl(true),
|
||||
// name, label, value, help string, extra data...
|
||||
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
|
||||
'$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), 'UTF-8'),
|
||||
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
|
||||
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
|
||||
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
|
||||
|
|
|
@ -447,7 +447,7 @@ function check_htaccess(&$checks) {
|
|||
|
||||
|
||||
function manual_config(&$a) {
|
||||
$data = htmlentities($a->data['txt']);
|
||||
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
|
||||
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
||||
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
||||
return $o;
|
||||
|
|
|
@ -69,6 +69,9 @@ function notifications_content(&$a) {
|
|||
|
||||
nav_set_selected('notifications');
|
||||
|
||||
$json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
|
||||
|
||||
|
||||
$o = '';
|
||||
$tabs = array(
|
||||
array(
|
||||
|
@ -211,7 +214,7 @@ function notifications_content(&$a) {
|
|||
}
|
||||
else
|
||||
info( t('No introductions.') . EOL);
|
||||
|
||||
|
||||
$o .= replace_macros($notif_tpl,array(
|
||||
'$notif_header' => t('Notifications'),
|
||||
'$tabs' => $tabs,
|
||||
|
|
1057
util/messages.po
1057
util/messages.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue