From 757211225f7d34a33e0385e8ca3726def4eea983 Mon Sep 17 00:00:00 2001 From: Chris Graham Date: Thu, 26 Jul 2012 11:42:56 +0100 Subject: [PATCH 1/3] Minor speculative fix --- sources/attachments2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/attachments2.php b/sources/attachments2.php index abcc5cb05..531371ea1 100755 --- a/sources/attachments2.php +++ b/sources/attachments2.php @@ -357,7 +357,7 @@ function do_comcode_attachments($original_comcode,$type,$id,$previewing_only=fal // Search backwards from $marker $tag_end_start=$marker-strlen('[/'.$attachment['tag_type'].']'); // would be correct if it is Comcode-XML, but they have the same length, so it's irrelevant $tag_start_end=$tag_end_start; - while (($tag_start_end>1) && ($new_comcode[$tag_start_end-1]!=']') && ($new_comcode[$tag_start_end-1]!='>')) $tag_start_end--; + while (($tag_start_end>1) && ((!isset($new_comcode[$tag_start_end-1])) || (($new_comcode[$tag_start_end-1]!=']') && ($new_comcode[$tag_start_end-1]!='>')))) $tag_start_end--; $param_keep=substr($new_comcode,0,$tag_start_end-1); $end_keep=substr($new_comcode,$tag_end_start); if ($comcode_text) From 9d93e7f5a1ee6c7e6463edc9e78dd04bf12d8f43 Mon Sep 17 00:00:00 2001 From: World Wide Web Server <_www@Chris-Grahams-iMac.local> Date: Fri, 27 Jul 2012 12:01:05 +0100 Subject: [PATCH 2/3] Commited fix to issue #704 (http://ocportal.com/tracker/view.php?id=704). [Social networking CPFs not showing] --- .../templates/OCF_MEMBER_PROFILE_ABOUT.tpl | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl b/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl index 5e9f10522..29e8970a5 100644 --- a/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl +++ b/themes/default/templates/OCF_MEMBER_PROFILE_ABOUT.tpl @@ -17,6 +17,25 @@

{!MORE_ACCOUNT_LINKS,{USERNAME*}}

+ {+START,IF,{VIEW_PROFILES}} + {+START,LOOP,CUSTOM_FIELDS} + {$SET,is_messenger_field,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME},{!DEFAULT_CPF_im_aim_NAME},{!DEFAULT_CPF_im_yahoo_NAME},{!DEFAULT_CPF_im_skype_NAME},{!DEFAULT_CPF_im_icq_NAME},{!DEFAULT_CPF_im_jabber_NAME},{!DEFAULT_CPF_sn_twitter_NAME},{!DEFAULT_CPF_sn_facebook_NAME},{!DEFAULT_CPF_sn_google_NAME}}} + {+START,IF,{$GET,is_messenger_field}} + {+START,SET,messenger_fields} + {$GET,messenger_fields} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME}}}
  • {!ADD_AS_FRIEND} (Windows Live Messenger)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_aim_NAME}}}
  • {!MESSAGE_THEM} (AOL Instant Messenger)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_yahoo_NAME}}}
  • {!ADD_AS_FRIEND} (Yahoo Messenger)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_skype_NAME}}}
  • {!PHONE_THEM_UP} (Skype)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_icq_NAME}}}
  • {!MESSAGE_THEM} (ICQ)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_jabber_NAME}}}
  • {!MESSAGE_THEM} (Jabber/XMPP)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_twitter_NAME}}}
  • @{VALUE*} (Twitter)
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_facebook_NAME}}}
  • Facebook
    • {+END} + {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_google_NAME}}}
  • Google+
    • {+END} + {+END} + {+END} + {+END} + {+END} {+START,IF_NON_EMPTY,{ACTIONS_contact}{$GET,messenger_fields}}

    @@ -100,20 +119,6 @@ {+START,IF,{VIEW_PROFILES}} {+START,LOOP,CUSTOM_FIELDS} {$SET,is_messenger_field,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME},{!DEFAULT_CPF_im_aim_NAME},{!DEFAULT_CPF_im_yahoo_NAME},{!DEFAULT_CPF_im_skype_NAME},{!DEFAULT_CPF_im_icq_NAME},{!DEFAULT_CPF_im_jabber_NAME},{!DEFAULT_CPF_sn_twitter_NAME},{!DEFAULT_CPF_sn_facebook_NAME},{!DEFAULT_CPF_sn_google_NAME}}} - {+START,IF,{$GET,is_messenger_field}} - {+START,SET,messenger_fields} - {$GET,messenger_fields} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_msn_NAME}}}
  • {!ADD_AS_FRIEND} (Windows Live Messenger)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_aim_NAME}}}
  • {!MESSAGE_THEM} (AOL Instant Messenger)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_yahoo_NAME}}}
  • {!ADD_AS_FRIEND} (Yahoo Messenger)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_skype_NAME}}}
  • {!PHONE_THEM_UP} (Skype)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_icq_NAME}}}
  • {!MESSAGE_THEM} (ICQ)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_im_jabber_NAME}}}
  • {!MESSAGE_THEM} (Jabber/XMPP)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_twitter_NAME}}}
  • @{VALUE*} (Twitter)
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_facebook_NAME}}}
  • Facebook
    • {+END} - {+START,IF,{$EQ,{NAME},{!DEFAULT_CPF_sn_google_NAME}}}
  • Google+
    • {+END} - {+END} - {+END} {+START,IF,{$NOT,{$GET,is_messenger_field}}} From 98ecc6dbf6ef55c5d261080b4b70eb8288aca279 Mon Sep 17 00:00:00 2001 From: Chris Graham Date: Fri, 27 Jul 2012 12:01:18 +0100 Subject: [PATCH 3/3] Fixed type strictness error --- sources/global2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/global2.php b/sources/global2.php index c57c5a83b..9b82bef67 100644 --- a/sources/global2.php +++ b/sources/global2.php @@ -1788,7 +1788,7 @@ function javascript_tempcode($position=NULL) $js->attach(do_template('JAVASCRIPT_NEED',array('_GUID'=>'b5886d9dfc4d528b7e1b0cd6f0eb1670','CODE'=>$j))); } } - $js->attach($JAVASCRIPT); + if (!is_null($JAVASCRIPT)) $js->attach($JAVASCRIPT); return $js; }