aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-10-20 14:55:40 -0700
committerFriendika <info@friendika.com>2011-10-20 14:55:40 -0700
commitbef7a5d66bf7ef26e0d4da1c6209f3e23b0ccffe (patch)
tree889de056b7586f19b8ee3aff790c06987e949dd0
parentda416e0181663b33304eadc0b1db228e6f1f5b7d (diff)
downloadvolse-hubzilla-bef7a5d66bf7ef26e0d4da1c6209f3e23b0ccffe.tar.gz
volse-hubzilla-bef7a5d66bf7ef26e0d4da1c6209f3e23b0ccffe.tar.bz2
volse-hubzilla-bef7a5d66bf7ef26e0d4da1c6209f3e23b0ccffe.zip
bug #183 - strlen borking on sysmsg, which is now an array
-rw-r--r--boot.php6
-rw-r--r--mod/install.php8
2 files changed, 7 insertions, 7 deletions
diff --git a/boot.php b/boot.php
index b846bcd08..017e21814 100644
--- a/boot.php
+++ b/boot.php
@@ -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;
diff --git a/mod/install.php b/mod/install.php
index 27cc6af84..78e537cfe 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -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;