Permalink
Browse files

chore(markdown): replaces Markdown library with composer managed version

BREAKING CHANGE:
dropped library elgg.markdown

The Markdown library is available as a composer package, this requires
less maintenance by Elgg developers.

fixes #8597
  • Loading branch information...
jeabakker committed Jun 30, 2015
1 parent ebccf01 commit df68d9864f787fa55fa1f9457692f1dbcd5587d6
View
@@ -31,7 +31,8 @@
"bower-asset/jquery-imgareaselect": "^0.9.0",
"bower-asset/jquery-ui-extensions": "dev-master",
"bower-asset/jquery-jeditable": "^1.7.3",
- "FortAwesome/Font-Awesome": "^4.3"
+ "FortAwesome/Font-Awesome": "^4.3",
+ "michelf/php-markdown": "^1.5.0"
},
"repositories": [
{
@@ -471,6 +471,11 @@ Also several workarounds for very old views are no longer performed. Make these
- Set ``$vars['name']`` instead of ``$vars['internalname']``.
- Set ``$vars['id']`` instead of ``$vars['internalid']``.
+Removed libraries
+-----------------
+
+ - ``elgg:markdown``: Elgg no longer provides a markdown implementation. You must provide your own.
+
Specifying View via Properties
------------------------------
View
@@ -515,8 +515,6 @@ function _elgg_plugins_init() {
elgg_register_action('admin/plugins/deactivate_all', '', 'admin');
elgg_register_action('admin/plugins/set_priority', '', 'admin');
-
- elgg_register_library('elgg:markdown', elgg_get_root_path() . 'vendors/markdown/markdown.php');
}
return function(\Elgg\EventsService $events, \Elgg\HooksRegistrationService $hooks) {
@@ -1,36 +0,0 @@
-PHP Markdown & Extra
-Copyright (c) 2004-2013 Michel Fortin
-<http://michelf.ca/>
-All rights reserved.
-
-Based on Markdown
-Copyright (c) 2003-2006 John Gruber
-<http://daringfireball.net/>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-* Neither the name "Markdown" nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-This software is provided by the copyright holders and contributors "as
-is" and any express or implied warranties, including, but not limited
-to, the implied warranties of merchantability and fitness for a
-particular purpose are disclaimed. In no event shall the copyright owner
-or contributors be liable for any direct, indirect, incidental, special,
-exemplary, or consequential damages (including, but not limited to,
-procurement of substitute goods or services; loss of use, data, or
-profits; or business interruption) however caused and on any theory of
-liability, whether in contract, strict liability, or tort (including
-negligence or otherwise) arising in any way out of the use of this
-software, even if advised of the possibility of such damage.
Oops, something went wrong.

0 comments on commit df68d98

Please sign in to comment.