mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

revert main fbf821c capabilities changes

Browse Source
This commit is contained in:
Ian
2014-10-06 14:18:37 +02:00
parent 27c5b2d589
commit 93667e2f46
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@@ -5,8 +5,6 @@ Version 2.0-beta4 / RC? ()
* Fix issue #220 with pdf directory moving rename() error
* Change name and fix $serendipity['capabilities']['jquery_noConflictMode']
* Fix bug in entry listing, which showed wrong categories for
entries (Issue #201)
@@ -101,7 +99,7 @@ Version 2.0-beta3 (July 25th, 2014)
to older plugins.
This mode is now considered deprecated and will be removed in
future releases. A new variable:
$serendipity['capabilities']['jquery_noConflictMode'] = false;
$serendipity['capabilities']['jquery-noconflict'] = false;
in your theme's config.inc.php file can now turn of that
noConflict-mode.

13
include/plugin_api.inc.php
View File

@@ -12,14 +12,11 @@ include_once S9Y_INCLUDE_PATH . 'include/functions.inc.php';
/* Core API function mappings
* This allows the s9y Core to also execute internal core actions on plugin API hooks
* Future use: Global variable can be customized/overriden by your own plugin on the frontend_configure event
* or during runtime, or the serendipity_config_local.inc.php file.
* or during runtime. The capabilities are theme or plugin based only.
*/
if ( false !== $serendipity['capabilities']['jquery'])
$serendipity['capabilities']['jquery'] = true;
if ( false !== $serendipity['capabilities']['jquery_backend'])
$serendipity['capabilities']['jquery_backend'] = true;
if ( false !== $serendipity['capabilities']['jquery_noConflictMode'])
$serendipity['capabilities']['jquery_noConflictMode'] = true; //set as being deprecated, while we should not need it anymore
$serendipity['capabilities']['jquery'] = true;
$serendipity['capabilities']['jquery_backend'] = true;
$serendipity['capabilities']['jquery-noconflict'] = true; //set as being deprecated, while we should not need it anymore
$serendipity['core_events']['frontend_header']['jquery'] = 'serendipity_plugin_api_frontend_header';
$serendipity['core_events']['backend_header']['jquery'] = 'serendipity_plugin_api_backend_header';
@@ -37,7 +34,7 @@ function serendipity_plugin_api_frontend_header($event_name, &$bag, &$eventData,
?>
<script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery.js"></script>
<?php
if ($serendipity['capabilities']['jquery_noConflictMode']) {
if ($serendipity['capabilities']['jquery-noconflict']) {
?>
<script>jQuery.noConflict();</script>
<?php