From 03b5e3aa0c99ce6c290156ddccc9cba6744f245d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 7 Mar 2012 21:12:31 -0800 Subject: [PATCH 1/3] reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) --- mod/network.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/network.php b/mod/network.php index 8da1561a0..27c6e315b 100755 --- a/mod/network.php +++ b/mod/network.php @@ -470,7 +470,7 @@ function network_content(&$a, $update = 0) { if(count($r)) { foreach($r as $rr) - if(! array_key_exists($rr['item_id'],$parents_arr)) + if(! in_array($rr['item_id'],$parents_arr)) $parents_arr[] = $rr['item_id']; $parents_str = implode(', ', $parents_arr); From b7bfff12b9adc6fd4e5508719854dce37460e68c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 8 Mar 2012 16:25:14 +1100 Subject: [PATCH 2/3] Update README --- README | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README b/README index 152d481ea..d85d98aad 100644 --- a/README +++ b/README @@ -1,4 +1,11 @@ Friendica Social Communications Server ====================================== +http://friendica.com + Welcome to the free social web. + + +Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers. + +Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today. \ No newline at end of file From 1fcbc7aa5a0b560b99201320a64e4e7671665613 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 8 Mar 2012 14:49:07 +0100 Subject: [PATCH 3/3] add links to /profiles, add some icons to diabook/icons, fixes in css --- view/theme/diabook/icons/bluebug.png | Bin 0 -> 1032 bytes view/theme/diabook/icons/lupe.png | Bin 0 -> 697 bytes view/theme/diabook/nav.tpl | 8 +++- view/theme/diabook/profile_vcard.tpl | 64 +++++++++++++++++++++++++++ view/theme/diabook/style.css | 35 ++++++++++++--- 5 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 view/theme/diabook/icons/bluebug.png create mode 100755 view/theme/diabook/icons/lupe.png create mode 100644 view/theme/diabook/profile_vcard.tpl diff --git a/view/theme/diabook/icons/bluebug.png b/view/theme/diabook/icons/bluebug.png new file mode 100644 index 0000000000000000000000000000000000000000..3979e7d8e78731f4646d6a8208cc48c6b7bdfa1d GIT binary patch literal 1032 zcmV+j1o!)iP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY( z6*~k{ZGI;J00W3gL_t(I%bk=xY#db-h0lF&X5P;3de`3dt{2(Cv0_Y2*0ziwfGr?G zq(MSLAVir02|5r`q;$|yQBffwQ3P7t(BYs+Kx8Na#1X7*#r&AW@p`>KGqbZZ?~lUR z!X3)(ZgDWAv{vm>xiTrWdBSML zADf%k(~rzdltxF(ouI3=l(lSbXmO}e^y0YR@;p&Z(bp=W_sXjzCcqHbzG)Z^|&({(ZAC z>3HIWOg1-`&F2jO^n-v!LAMo$;cWmT*+Q`%hr#zpdOk5eg+gHjz21RFKP+aa7b?}I zi)W4SPlZ8{@3z}K2>VbXCkr$6-KiH}-Y(ZB4Bjina6G>+5vqcH=7kS_cuqT8salYxcs&D+~1} zm)@(EhR+F?ajgc9H3Lor5P2p|xoWn0`hKgk*}A{|$+fp%S_RN3Rw{=(vetr#p68D9 z2K?-~7%Ue?2>^oY7r|T(qbyG;CXKUz8)2lp=hJ3yn`Y#xF#e)e$yJ-0eu>uKZ$ zi9#9wSSK_v}CCJm4>j?@AY49fRO zy22*i&Q`p(x}t7;wWom&tTp`DBEuuE_O5+-OF#EoU^~$mMNx_Q!eQAgk;4eql1ima z2C@%Q=wjg501vfn)cV%&L#Gv*WH>uD120RVmY^Qn9_KMN2Gno$E+=C%RA z^F-BJTi3?KMyneqa)lThBgWkSn?uByON@;j_5T0~%doWJvPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyY( z6(2hl!+507r=BBMel$CGaHnY2kOqb#Sp^xy}+ntJp@cj+L1J6 zX2mFqo@6qaSLJf~AutX+2Mz%@B^A0>7{~D)GdnM7NzyIv{aUqJwdLhy0|+5(#Bsa= zi~z&HKt7*;9YWY{TcMeaNooMz%s#cdz0qi_0xu(Rv%6ad1+5wBjqJR@-*4x^yPL}7=Xe6al>3F-tJv}`q&FoS-m<2QY z)^RBLe0~kM3=9JM;y7N(<#Ow_TFr{Zq6&q=Dc}Z>NU8((DwRsD8}Ku5EX~$usermenu.1 {{ endfor }} - {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} + {{ if $nav.profiles }}
  • $nav.profiles.3
    • {{ endif }} + {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} {{ if $nav.messages }}
  • $nav.messages.1
    • {{ endif }} {{ if $nav.contacts }}
  • $nav.contacts.1
    • {{ endif }} @@ -141,6 +142,11 @@ +
    +
    $langselector
    +
    + +