From 4c1f23d33a354bb4ed65c14e90b5c9edd193082f Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 19 Dec 2019 20:26:08 +0100 Subject: [PATCH] Preparing the release 5.2.0 RC 2 --- com.woltlab.wcf/files_pre.tar | Bin 198144 -> 200192 bytes com.woltlab.wcf/package.xml | 16 ++++++---- .../acp/update_com.woltlab.wcf_5.2.0_rc_2.php | 30 ++++++++++++++++++ .../update_com.woltlab.wcf_5.2_preUpdate.php | 30 ++++++++++++++++++ .../install/files/lib/system/WCF.class.php | 2 +- 5 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php diff --git a/com.woltlab.wcf/files_pre.tar b/com.woltlab.wcf/files_pre.tar index dc0774f9d6ffa1eaa3602116baefe76e8a16d995..5a42367369b780ab8b6e02c2c754bacd99c6d319 100644 GIT binary patch delta 4085 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 B0RaF2 delta 3534 zcma)8eQZ-z6z846wwAt)L1ni4dff{9kg>MwI$&%tStG~-$cIFQjK}NSR_Xd`->ZX& z5k-lK1k@UCqW*#Z7*tFk7>$}3G$tB@Fs1?lgaHdvBvBzuKAd{)eQo!)ZpgCjzI*Ta z_?_Q5_ujMZZOgWumTfO`AHj=9Y+jdlg1fe^-s^GuT(zzVE|=TmtM^QB#q%-(hd42l zBT_pQlfI*nMIJZ`cJj?(PSB^Dj>7$^>16WZQLv__WvQ=hQgsYw8m8UHU`A@1MZP*_ zu#&Z>2l5S@jXmg_c|6<$IppOYu%)K6402PCL!n{1dgOG^@uZ9Ik3&w}vtJryY2lQ++Ej;uA2fT+nT zIX;!Mk_Uf)s!ZN2R0%wZ;P*uO9e?VVeR(y!nKwH%abrkUg+}2Co`^qVFkL@F{uJJ9 zGF3N8N+{M9Rx5DpwV%M7A5>d{DwPkES5k@fm9ub2=v_Gh=0a5ywV0~!8ud}w6n9+A zCw={3wo!Px4D}LLv}LhSr~-{qH*+Vs%M+iCTwF+1OH-}k93KB-@7^@>V(ZTCrN5z^g zhqb6N+M!cmGcj~DF$DQ=V+gofp2op_8413pVyUI8HJt-RyVaPQ90NVMpas{ zxI_;6@!;?NiObHYz^Ywv76i=Lfj%fAThD@pJii_6^-q+Kz_UK(LkYLYAz70v$`>`S zTGZU)Pb0geSPXZ>#16SFsL5SpFiwv(S@bhZA6+5NyK`i*i4x87>MaqOazukMB)Qbq zrfhstmc~kQ-Z}7%_J+64Imk-SDTDX%Ik4(ykT{YlvILawa7YmY^sXTr`oWs*N+fDn zD3_kVmV{tZj@NT!09$O2AVcZo(A*M-hnvodf*d&y#f%g~!rjyo) zwmxv_$)3sbOn&c!9C}{+pdg)}rVC(7@H6TfFh@jblO90w+I#=PSSEhE0J-C2bpyxl zEQ@tyR`tp!j>kDCm0 zWAfHzu#6MKua_YwJ?NqV;Kxy*f#&Eb!f@9&V6#A88h|o%zi$9)aX2#oPAZXTAt)(i z?^Uo(!K_qPH$|cfy(cRw8^}8r?w>tZU}v7!Q z=(&9!Z=IVqdf4^hINa!EUW3_KHb|$?Ew!)1HbPt%3T~3uwc@`9p0r+rQUn&h29>lE zvRi5dNAia!pI(Dqxcks`*p0)9>#)?tn`?|B*bmiIRk3Dip%~LTm8j`qMeU43%=kzP&+ukaRthuF z@!A{ESd3f++l7kOB}@Hn{$R zg(dhXB+*Mz8J~8Fe%eiV0Ck&gvi3o_2_c-F!I@t6rt-vvgZIAB*d!#DS+FM4v*>{S z@x*fryr|fIi5$}kNk(<=XJf&Pp%hmG$7y1RCvq$RdoH$czY;MFA`5UU}6%_w6r-Xd|H~4i}Fa&Fn z0Yq1Y!}cL?)>0TIDb^JWiCXY!nbtJz%c*HqcM}MzY=)~Yij5j|k~>3Sp=oDWt4aMo z@Cs%6z|(d*xUFT_QXxm!xk;Tug@3aov$7SOGOIP)zc7=siN9KBRO!a`hIn(&iZ?QL qFree CMS and web-framework, designed for awesome websites and communities. Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht. 1 - 5.2.0 RC 1 - 2019-12-12 + 5.2.0 RC 2 + 2019-12-20 @@ -51,7 +51,8 @@ - + files_preUpdate.tar + acp/update_com.woltlab.wcf_5.2_preUpdate.php files_pre.tar @@ -103,13 +104,14 @@ defaultStyle.tar - - - acptemplates_update.tar + files_update.tar + acp/update_com.woltlab.wcf_5.2.0_rc_2.php + acp/update_com.woltlab.wcf_5.2_deleteRecentActivity.php + - + diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php new file mode 100644 index 0000000000..cc63b5ce9f --- /dev/null +++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2.0_rc_2.php @@ -0,0 +1,30 @@ + + */ +$tables = [ + PartialDatabaseTable::create('wcf1_media') + ->columns([ + // Incorrect column name in the upgrade 3.1 -> 5.2.0 RC 1 + NotNullInt10DatabaseTableColumn::create('lastDownload') + ->defaultValue(0) + ->drop(), + NotNullInt10DatabaseTableColumn::create('lastDownloadTime') + ->defaultValue(0) + ]), +]; + +(new DatabaseTableChangeProcessor( + /** @var ScriptPackageInstallationPlugin $this */ + $this->installation->getPackage(), + $tables, + WCF::getDB()->getEditor()) +)->process(); diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php new file mode 100644 index 0000000000..6c3a29fbeb --- /dev/null +++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_5.2_preUpdate.php @@ -0,0 +1,30 @@ + + * @package WoltLabSuite\Core + */ +if (Package::compareVersion(WCF_VERSION, '3.1.11', '<')) { + if (WCF::getLanguage()->getFixedLanguageCode() == 'de') { + throw new SystemException("Die Aktualisierung erfordert WoltLab Suite Core (com.woltlab.wcf) in Version 3.1.11 oder höher."); + } + else { + throw new SystemException("The update requires WoltLab Suite Core (com.woltlab.wcf) in version 3.1.11 or newer."); + } +} + +$requiredPHPVersion = '7.0.22'; +$comparePhpVersion = preg_replace('/^(\d+\.\d+\.\d+).*$/', '\\1', phpversion()); +if (version_compare($comparePhpVersion, $requiredPHPVersion) === -1) { + if (WCF::getLanguage()->getFixedLanguageCode() == 'de') { + throw new SystemException("Die Aktualisierung erfordert PHP in Version {$requiredPHPVersion} oder höher."); + } + else { + throw new SystemException("The update requires PHP in version {$requiredPHPVersion} or newer."); + } +} diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 6b9d87d5c2..8bb613e1a3 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -49,7 +49,7 @@ if (!@ini_get('date.timezone')) { } // define current woltlab suite version -define('WCF_VERSION', '5.2.0 RC 1'); +define('WCF_VERSION', '5.2.0 RC 2'); // define current API version // @deprecated 5.2 -- 2.20.1