diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/contao/Makefile.common | 4 | ||||
| -rw-r--r-- | www/contao31/PLIST | 17 | ||||
| -rw-r--r-- | www/contao31/distinfo | 9 | ||||
| -rw-r--r-- | www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php | 20 |
4 files changed, 7 insertions, 43 deletions
diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common index 3aaa6e4e17f..5fcf39331f4 100644 --- a/www/contao/Makefile.common +++ b/www/contao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2013/09/30 10:04:34 taca Exp $ +# $NetBSD: Makefile.common,v 1.44 2013/10/15 14:33:28 taca Exp $ # # used by www/contao/Makefile.example" # used by www/contao211/Makefile @@ -12,7 +12,7 @@ CT_MASTER_SITE= https://download.contao.org/ \ # current release CT211_VERSION= 2.11.12 -CT310_VERSION= 3.1.3 +CT310_VERSION= 3.1.4 CT_VERS?= 211 diff --git a/www/contao31/PLIST b/www/contao31/PLIST index ea09afe50f7..8bc801d6e29 100644 --- a/www/contao31/PLIST +++ b/www/contao31/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2013/09/30 10:04:34 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2013/10/15 14:33:28 taca Exp $ ${CT_WEBDIR}/.gitignore ${CT_WEBDIR}/README.md ${CT_WEBDIR}/assets/ace/1.0.01/ace.js @@ -542,21 +542,6 @@ ${CT_WEBDIR}/assets/tinymce/plugins/searchreplace/langs/uk_dlg.js ${CT_WEBDIR}/assets/tinymce/plugins/searchreplace/langs/vi_dlg.js ${CT_WEBDIR}/assets/tinymce/plugins/searchreplace/langs/zh_dlg.js ${CT_WEBDIR}/assets/tinymce/plugins/searchreplace/searchreplace.htm -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/changelog.txt -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/EnchantSpell.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/GoogleSpell.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/PSpell.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/PSpellShell.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/SpellChecker.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/utils/JSON.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/classes/utils/Logger.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/config.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/css/content.css -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/editor_plugin.js -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/editor_plugin_src.js -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/img/wline.gif -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/includes/general.php -${CT_WEBDIR}/assets/tinymce/plugins/spellchecker/rpc.php ${CT_WEBDIR}/assets/tinymce/plugins/style/css/props.css ${CT_WEBDIR}/assets/tinymce/plugins/style/editor_plugin.js ${CT_WEBDIR}/assets/tinymce/plugins/style/editor_plugin_src.js diff --git a/www/contao31/distinfo b/www/contao31/distinfo index c3a009c6b29..d67aa35e552 100644 --- a/www/contao31/distinfo +++ b/www/contao31/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2013/09/30 10:04:34 taca Exp $ +$NetBSD: distinfo,v 1.7 2013/10/15 14:33:28 taca Exp $ -SHA1 (contao/3.1.3.tar.gz) = 50e940110485bb12dfe36dd2798128c398e7c9e5 -RMD160 (contao/3.1.3.tar.gz) = d378f3e51d63a26814ff6c8c0c94096c670cd83a -Size (contao/3.1.3.tar.gz) = 9204208 bytes -SHA1 (patch-system_modules_core_library_Contao_Database_Updater.php) = be4f8eeda2237f6c8f47a405b2bd76428f41144e +SHA1 (contao/3.1.4.tar.gz) = 7e270e6333be44705b7c6c2e0ae36c6cc3bc9c80 +RMD160 (contao/3.1.4.tar.gz) = 407b6df6ebd0d67fa8d4222e0e4cc2bae128f65f +Size (contao/3.1.4.tar.gz) = 10804581 bytes diff --git a/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php b/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php deleted file mode 100644 index c73b1c8a006..00000000000 --- a/www/contao31/patches/patch-system_modules_core_library_Contao_Database_Updater.php +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-system_modules_core_library_Contao_Database_Updater.php,v 1.1 2013/09/29 03:40:32 taca Exp $ - -Workaround for contao 3.1.0 update; make proper update of accordion -content element. - ---- system/modules/core/library/Contao/Database/Updater.php.orig 2013-09-24 08:33:35.000000000 +0000 -+++ system/modules/core/library/Contao/Database/Updater.php -@@ -455,9 +455,9 @@ class Updater extends \Controller - } - - // Adjust the accordion elements -- $this->Database->query("UPDATE `tl_content` SET `type`='accordionStart' WHERE `type`='accordion' AND `mooType`='start'"); -- $this->Database->query("UPDATE `tl_content` SET `type`='accordionStop' WHERE `type`='accordion' AND `mooType`='stop'"); -- $this->Database->query("UPDATE `tl_content` SET `type`='accordionSingle' WHERE `type`='accordion' AND `mooType`='single'"); -+ $this->Database->query("UPDATE `tl_content` SET `type`='accordionStart' WHERE `type`='accordion' AND `mooType`='mooStart'"); -+ $this->Database->query("UPDATE `tl_content` SET `type`='accordionStop' WHERE `type`='accordion' AND `mooType`='mooStop'"); -+ $this->Database->query("UPDATE `tl_content` SET `type`='accordionSingle' WHERE `type`='accordion' AND `mooType`='mooSingle'"); - - // White-space is now in the "alignment" section (see #4519) - $this->Database->query("UPDATE `tl_style` SET `alignment`=1 WHERE `whitespace`!=''"); |