From 850159959a1944ef1c1525490ac44c6a8a4ad1d9 Mon Sep 17 00:00:00 2001 From: Sergey Chernyshev Date: Sun, 1 Jun 2014 07:52:43 -0400 Subject: [PATCH 1/2] Fixed regression that required for plans to be always there --- classes/User.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/User.php b/classes/User.php index d57ab28..373ed68 100644 --- a/classes/User.php +++ b/classes/User.php @@ -518,6 +518,7 @@ private function init() { } $invitation_account = null; + $plan = null; if (!is_null($invitation)) { $invitation_account = $invitation->getAccount(); @@ -528,11 +529,12 @@ private function init() { ) { $invitation_account->addUser($this); } + + $plan = $invitation->getPlan(); } $new_user_account = null; if (is_null($invitation_account) || UserConfig::$createPersonalAccountsIfInvitedToGroupAccount) { - $plan = $invitation->getPlan(); if ($plan) { $new_user_account = Account::createAccount($this->name, $plan->getSlug(), null, $this, Account::ROLE_ADMIN); } else { From 4e76a251f3bbc2970efb3992ab1f268d91f256ee Mon Sep 17 00:00:00 2001 From: Sergey Chernyshev Date: Sun, 1 Jun 2014 09:28:45 -0400 Subject: [PATCH 2/2] Updated button images --- modules/facebook/facebook-sprite.png | Bin 1161 -> 4522 bytes modules/facebook/index.php | 4 ++-- modules/linkedin/linkedin-small.png | Bin 1434 -> 4178 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/facebook/facebook-sprite.png b/modules/facebook/facebook-sprite.png index 4333448af1ad70b1a09a932b66065156f6de314c..88fd501e2d8dfef78c948befcb6f62d986d23cae 100644 GIT binary patch delta 4388 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 e*%M&lzX1S1Om&5;6rJDz0000 delta 984 zcmV;}11J2dBZ&zmiBL{Q4GJ0x0000DNk~Le0002`0000&2m=5B07s8Y2ry=IzJlP}Q?lRX=!i^-#Xh`m;xGp3B$Cy4KkWzJHsg^)qNRAM0z<3gG=} zg~7!-DuDIG@_upHG0^%i5;|AGg-M{;wj1aQmawaR8=Zd{&al+#?lJnsiqQHK3E-Uy zKI(V54EK4Bpo9-C(U}ZnuXqJl-_~%X*YvaMKkn{sW5dW&7aWSa*kma z`+Ce-w$?YTKnvp!I;9@Xs+Mhrf=%0C)liWq#fHJG6A0+l>0f zT6kKgoKmysW5lZ}dv+_denUd*D)^z_)uUO}vdvI%LvK_=MV<^F;BVn+opMUu^Ym5O zvs-QwI zu7Y!xx=)w4IB7!GXT}j)zayb_6@2A6xJwcQD*O8(`5R*jt-m4xyjH=_-{lLfza*h` z6#POoi5q&_997AhJU1C1A;u^&!@emBpT^$3v-f>vMFA+XcZRhjiZESZH(^shpOUW1toISwF5u({RmqUgebH5!^*$o&$DlR?HRN+& zbX8_OLS!wLNyybAq5NmF+9~O(%zB*2?j3)erqNZI^&TR-Z*ZDMS7p{qAhJU1B@kJm z^%98eh}Msd$O^3&L04tgXQ6V5tccjo%+PFU7K(w!<#OhFaJc>|+G2_Y&C*IO=~v zlR*F}Mz)=nP3&l4Y?(l0GvKIWovy=rP9#RQo9>r|)_aL;1{`&$Y|B}_jl+=*$g=9P+2=+Hx5I#PD|{BL1LS9M>ZXfa)L`-wsX^VRAlRe#)|}En@41GbtnY4 z9!O*bIuwLkmrG0000H`1~#ovU0tamg35bCI`@q}}D zo6Px%5g%gXhc4HGKe*1cVt$O=)XmCmm!F_($M8DwiPO|X^u)r5OJI!mzef!8_OEU7 zD})oWdIB>1S_fvIYZeH&2$hlHdEAND4j=(jMEIanJG)bmKIWEm7nW%O35$eu`X>LQ zi62G@6oL|Ag+M_C5{AxTHvqXfz-HLqZUa2w12!Ble@uZe^hIVc1em{Nrh?=q111W` zSS8>r4a&!i;+27kAfR;8?3Dy_d_Yj$*hvjkH-OGjGNKxQPYeY0VxzbKPB5?;WMK&a zk(q!}<=9x}7f&VGHus%VnKd#^tdh#%=J(I9n0rKF1_D)sQOGf!v)1;}g%n-YDn2X_}wk+T5Je=!Kcv4jG5sAiJ$Q zjj!E)hss=G&c3&=vxW;>hO6RSeDD5xs#QQgmO>C|xAY@P^{RpB_KIQZaj&{vlLSoB&605TC-9c_9{J7jMFnh)5vY48XemsK7 zP>tbO)*DMQ#zLhzS$Yr%zq*QURTX+0UZW@bjkpfpR4hRosgh4L?%*qwmGmGtd))go zt?X;@yzTKaXVQfvIrxBJ=T90ukzO}J{{9}=r+;_}Q1-*09+wlB_0v`xm1DQWo!O6l z^2Z?$SMDSb$MJ_T*)l4snP{2l%&8SK(X)!)Um%bmz>d`G=6H-M*8I%geE)YZjh(Pi zjENdA%M5uEg#cM_EWB5Ol{^kE%+d4)Oa0SF#3cEo%H%VBmL1-bY*95@7Sxvo2iF=r z$+x^rJcCi2=*^x@kxjZy=3{e0w4H+2#|wjXPW_>$8V|R~wnVpZ9W#U#4L@Y*FBj(_ z?u#Xv!7B3V^{ez^iYY{&XGxAkJW$sxsK`&9qIITr#<*1d^liSsoXV(^K5jfYyrcRv z{U`RRKQT0#Dqh^_Eb7<0Yph@Vd+XKk>QEqFe0hM${?gt#ZbgxqlDmFTA5)f`pKRFodL2$x;Um3 zS?qz3{}^g|9fxb$qt&Ae|EQPy$$F!;pNYu+VQl~}vn#YL`gyomFZ-vF`4@iNEg9Dg zEeW!vC3%u?5e*UJTK$u^PV#sg8D1Cfe02!6Ig8RyLgQB`kGR&k=n6%(nuHuJTual^ z(@e_L%Jj-q_u9lO4~o!*ZOSdCm*FIe0~#C_9ID8q(R=7^gL#AHBEq5v+Okq-mHefy z1$22WO8y56rHIOo8Z4S)p0s?d3sLu`?D z)X0Xu%AP}18!DtZPKbx+9d9ZC$!}rX~axG}`44qw@-F;BJ zSam3V=yDjd^!}^pd#)T)5ufp%LHKvQtqFOe_o;%etL34(aNTfZ-8PGWy+E>Y#cXv$ zfqyB+_J~^UT+aLbhTMjX#ES5Wsr6Th&W6E;Vci~&9P6l6_)C^shufgr2~ZTq20>!S zg)4@eV_jYZyfV%&12 z{7+>TB$`E=<@@=aOutT>piR`>H0dSzxhut=xwWre9h}6hqt}Txf~hkE1}!}U^G3T* zqlzAs@RRdOr738|>iqNeKSeU`;s>wUjw$@v5(xvl8M={=1t!ENV&~u%+>AQMYTVjE zDf`K-Vu7rEA_cr#O_3ZWZ(6mWTFco|IS;b@nB0YBrP_odQj*_z!AhC6QT51Ocl7@DfV`W0Ev3F7TGN=1!Q@9<`BTXn8Lz-a!VRi>JkdtD6M{v>_OVD;Z|Kkue$0Wu6sm=gj-P|drPwimbxYarmJ$&Lu^rCqy=34Gc z`=TMlP8CSY?nVRSa%a#Mn*pSrRGyUQ%Y#a5OY}FXtaQ zNy&A2@9UkbBKVlY7<&%&P5#YrCG`V=(2ME4+0luNiM;gVbX14?i-POj&b^0Ki~ZgG zjO||nM1-tPjV=$m{FnS0jy|lC>TbSZddYd~{QJ|H!FbUn>LChsi-VnUa%C^Vw|Mt& zGTE!?YXcC(20&N@0KaeVa0h_rf&lE=03ekC0JTSob)O0V_d?W_6cGUn`H4>`EN4dN1})&g|0J?@M7#Nwpg`xgNhOTfM_VU!B1m0_R^# zxTE)m*-*uIUN45ZudfQ)&No;f28Vf@a(K&$sHC<&Y`U;N?{d`3s3emq|7R^AIojC zH*V+akNu<#;bzvsdtt$AiA;6sNfuya`2C{%PM_0ASgYV zJvDT!JAP!(5hll<3dKOa*HER@u7!dSi_)A4u|J5RA7W0^N1vsoru}@c@5LMtjTX%dTD8q+eF#f|4+E z>lnLx1u7)LnK<-5K0N@?Jwm$VhWt}FI|}v3a>hiH7qEMU7Ek6@h$9|VPP;jkSuCV*P2f>d+ft*#q9}Q(M0V%+mA~1t(R!t_Lbs`u+Rkv4X?cH zE!vu<{xqNWj5drTOZ!CUdw?Jx9s}k0wSL;xG!wyiqD_`R1R=;XTqXm3l9;=qQB|6Z z`ZoxSixRwHRhXbusNES^;61|qo;5Nv`TRK#Oi)QH0P~4i*%m zJH7Y~Gk%!>UnnkC4hi^-*3_1U#A{L!nkM3MN*6UumOb61BqXwA1@9O(Ri+31IFRLA z`#?&DVhmn~*Y%@SV(#{pixACFX;@cTHb0&*ekOZ0R9k+;hCZi z4fDaL-4D~K|KdMi&5`8#yIGkfo~DV*ZPA-2vvQq$tJGmzcVsPe*R+WVE;4H&%4k!L-nR#n!ga8|&0_*TIBb!T-*!RMamiKyag6YoH_15<08P zmU!Hq;{FHo7dSjSeKYOuljX^+iLQ&6rA7sk+w&v!rZ#^+e})SF+e6Vw758yk`&nUV^0 zdf6E`dnJTrpw{06wZPuq-ptI5DXC!TXWPQBUI}3tu>K;b5m=TrD^*=9Th}^`Wx)EA zphm!u>Xqi7>RN-UsX^`6N(QVy2xcm!zMVWH^8k$gTo)JRi~{&kK8Vi95M;La%l9l66>W?C!BHX#)sYP5h8h-LHH(ohubnT#m~VxD3| z>Fo|HEGArS76c5bUTpeNGc~Ap48CdxsbFhE9gfl^X=gv1E$)J0Q~AYyc*rPkI2KhF zSDFFVJsA~X2Fl_NAKoBhRmovHAmCnF8d2Iggcu9bG>$|y?$U@84jTKz@luhPFjTJ5 zVW}#&RwEV*`Zls8LGq#(hO)u4Iq5-;AeF{sqfypN8>Ff{3#L?;{V#lUM>RF5cMQI2 zz{=^cw!q%HD%{k0boc4tAGB(TdJu+y<_lI1D34Ad@qvcQm;P}neANsB8{GAQ zW~3IwptV|E+&14+JWBI$VC~_wN*b$54uHRg3Jx#tZI8F11x>9V>bT9>m7BDG`$gqO zJ(M1_D_Xg=8sT^Lwx^H`ZR5~*uB|ljg`V*psF=RzQoGVtrpPii3x-su-yeOh@dqpe zR`v*_)D}QG694taWty>H9i97aW&pIZUYp7O7m&76sYl%dCQeC)NJ_#if*}>G{@M3# zVi~Y@&13E7i`rjC*3W)P?h@#MAr-9t)Vtqf8L%>#NF+8AiFAhG2r#62=Hks$?|g@4 zz}g|G5zI>Uq|Np8h3iDB{|oVWJQNC