mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid conflict with physical file config.js

This commit is contained in:
Thomas Müller 2013-12-31 14:34:28 +01:00
parent 760fa9ea30
commit 988710b0fc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/routes.php
View File

@ -7,6 +7,7 @@
*/ */
// Post installation check // Post installation check
/** @var $this OC_Router */
$this->create('post_setup_check', '/post-setup-check') $this->create('post_setup_check', '/post-setup-check')
->action('OC_Setup', 'postSetupCheck'); ->action('OC_Setup', 'postSetupCheck');
@ -61,7 +62,7 @@ $this->create('core_tags_delete', '/tags/{type}/delete')
->action('OC\Core\Tags\Controller', 'deleteTags') ->action('OC\Core\Tags\Controller', 'deleteTags')
->requirements(array('type')); ->requirements(array('type'));
// oC JS config // oC JS config
$this->create('js_config', '/core/js/config.js') $this->create('js_config', '/core/js/oc.js')
->actionInclude('core/js/config.php'); ->actionInclude('core/js/config.php');
// Routing // Routing
$this->create('core_ajax_routes', '/core/routes.json') $this->create('core_ajax_routes', '/core/routes.json')