Fixes #2725 - js page handler now handles javascript views with slashes in their...

git-svn-id: http://code.elgg.org/elgg/trunk@7647 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index f4e4874263c3095abf5e4ccf8bf1b3ad985803a1..8bbdf8758588ae4b8b942828cfa3c4540879620c 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2163,7 +2163,8 @@ function _elgg_shutdown_hook() {
  */
 function js_page_handler($page) {
        if (is_array($page) && sizeof($page)) {
-               $js = substr($page[0], 0, strpos($page[0], '.'));
+               $js = implode('/', $page);
+               $js = substr($js, 0, strpos($js, '.'));
                $return = elgg_view('js/' . $js);
 
                header('Content-type: text/javascript');

diff --git a/js/lib/languages.js b/js/lib/languages.js
index 0ac6545087d4ef4e209428d3b3683641911888a5..03ff4b81714ede0ad5f6b3df2432c7b834829a28 100644 (file)
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -25,9 +25,8 @@ elgg.add_translation = function(lang, translations) {
  */\r
 elgg.reload_all_translations = function(language) {\r
        var lang = language || elgg.get_language();\r
-       elgg.getJSON('_css/js.php', {\r
+       elgg.getJSON('pg/js/languages%252f' + lang + '.js', {\r
                data: {\r
-                       'js': 'languages/' + lang,\r
                        'viewtype': 'default',\r
                        'lastcache': elgg.config.lastcache\r
                },\r