diff options
| author | friendica <info@friendica.com> | 2014-02-20 02:30:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-20 02:30:37 -0800 |
| commit | 4944070e79d4914ba0503e6e90c194cbd766dc38 (patch) | |
| tree | bbd8477d04eb8fce18039923d889c469e9883128 | |
| parent | d8434bb480ee4f7a94246a8623614a4c3105a2a6 (diff) | |
| download | volse-hubzilla-4944070e79d4914ba0503e6e90c194cbd766dc38.tar.gz volse-hubzilla-4944070e79d4914ba0503e6e90c194cbd766dc38.tar.bz2 volse-hubzilla-4944070e79d4914ba0503e6e90c194cbd766dc38.zip | |
vsprintf error on update
| -rw-r--r-- | include/Contact.php | 4 | ||||
| -rw-r--r-- | install/update.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php index 2dab62fd8..09f7925cb 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -81,7 +81,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { if($a->poi) { $xchan = $a->poi; } - elseif($a->profile['channel_hash']) { + elseif(is_array($a->profile) && $a->profile['channel_hash']) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($a->profile['channel_hash']) ); @@ -114,7 +114,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { return replace_macros(get_markup_template('xchan_vcard.tpl'),array( '$name' => $xchan['xchan_name'], - '$photo' => ((array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']), + '$photo' => ((is_array($a->profile) && array_key_exists('photo',$a->profile)) ? $a->profile['photo'] : $xchan['xchan_photo_l']), '$follow' => $xchan['xchan_addr'], '$connect' => $connect, '$newwin' => (($mode === 'chanview') ? t('New window') : ''), diff --git a/install/update.php b/install/update.php index 3e39a5b4c..7d1305863 100644 --- a/install/update.php +++ b/install/update.php @@ -1088,7 +1088,7 @@ function update_r1097() { // fix some mangled hublocs from a bug long ago - $r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%/%'"); + $r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%%/%%'"); if($r) { foreach($r as $rr) { q("update hubloc set hubloc_addr = '%s' where hubloc_id = %d limit 1", |