diff options
| author | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-02-13 01:25:07 +0100 |
| commit | 5aff5b3913fbb6226d8fb3162453c58888fba38d (patch) | |
| tree | 2bf8fe649d8c9d09a3be03154c4c669bccfbc54c /views/default/js | |
| parent | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (diff) | |
| parent | 8d3a7ab1755829c6e070a038d6b33e326de8fc8f (diff) | |
| download | elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.gz elgg-5aff5b3913fbb6226d8fb3162453c58888fba38d.tar.bz2 | |
Merge tag '1.8.13' of git://github.com/Elgg/Elgg
Elgg 1.8.13 release
Diffstat (limited to 'views/default/js')
| -rw-r--r-- | views/default/js/elgg.php | 3 | ||||
| -rw-r--r-- | views/default/js/lightbox.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php index b82d98ce4..6fe03484d 100644 --- a/views/default/js/elgg.php +++ b/views/default/js/elgg.php @@ -56,7 +56,8 @@ if (0) { ?><script><?php } elgg.version = '<?php echo get_version(); ?>'; elgg.release = '<?php echo get_version(true); ?>'; elgg.config.wwwroot = '<?php echo elgg_get_site_url(); ?>'; -elgg.security.interval = 5 * 60 * 1000; <?php //@todo make this configurable ?> +<?php //@todo make this configurable ?> +elgg.security.interval = 5 * 60 * 1000; elgg.config.domReady = false; elgg.config.language = '<?php echo isset($CONFIG->language) ? $CONFIG->language : 'en'; ?>'; elgg.config.languageReady = false; diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php index d2bceaf90..a1f018eea 100644 --- a/views/default/js/lightbox.php +++ b/views/default/js/lightbox.php @@ -3,7 +3,8 @@ * Elgg lightbox * * Usage - * Apply the class elgg-lightbox to links. + * Call elgg_load_js('lightbox') and elgg_load_css('lightbox') then + * apply the class elgg-lightbox to links. * * Advanced Usage * Elgg is distributed with the Fancybox jQuery library. Please go to |