From 93667e2f4628d391d8e11f440b97ce343a4e487e Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Mon, 6 Oct 2014 14:18:37 +0200
Subject: [PATCH] revert main fbf821c capabilities changes

---
 docs/NEWS                  |  4 +---
 include/plugin_api.inc.php | 13 +++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 77c012de..9067f991 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -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.
 
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index 2702d213..c6020e96 100644
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -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