Browse Source

bug #183 - strlen borking on sysmsg, which is now an array

tags/2.32
Friendika 9 years ago
parent
commit
bef7a5d66b
2 changed files with 7 additions and 7 deletions
  1. +3
    -3
      boot.php
  2. +4
    -4
      mod/install.php

+ 3
- 3
boot.php View File

@@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');

define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
define ( 'FRIENDIKA_VERSION', '2.3.1139' );
define ( 'FRIENDIKA_VERSION', '2.3.1140' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1097 );

@@ -238,7 +238,7 @@ class App {
public $contacts;
public $page_contact;
public $content;
public $data;
public $data = array();
public $error = false;
public $cmd;
public $argv;
@@ -251,7 +251,7 @@ class App {
public $timezone;
public $interactive = true;
public $plugins;
public $apps = Array();
public $apps = array();
public $identities;

private $scheme;


+ 4
- 4
mod/install.php View File

@@ -52,7 +52,7 @@ function install_post(&$a) {

$result = file_put_contents('.htconfig.php', $txt);
if(! $result) {
$a->data = $txt;
$a->data['txt'] = $txt;
}

$errors = load_database($db);
@@ -107,7 +107,7 @@ function install_content(&$a) {
if(strlen($o))
return $o;

if(strlen($a->data)) {
if(strlen($a->data['txt'])) {
$o .= manual_config($a);
return;
}
@@ -203,7 +203,7 @@ function check_funcs() {
if(! function_exists('mb_strlen'))
notice( t('Error: mb_string PHP module required but not installed.') . EOL);
if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
notice( t('Please see the file "INSTALL.txt".') . EOL);
}

@@ -224,7 +224,7 @@ function check_htconfig() {

function manual_config(&$a) {
$data = htmlentities($a->data);
$data = htmlentities($a->data['txt']);
$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;


Loading…
Cancel
Save