diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/php/theme_init.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/php/theme_init.php')
| -rw-r--r-- | view/php/theme_init.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 49b3511c9..648b144b3 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -44,6 +44,7 @@ head_add_js('library/colorbox/jquery.colorbox-min.js'); head_add_js('library/jquery.AreYouSure/jquery.are-you-sure.js'); head_add_js('library/tableofcontents/jquery.toc.js'); +head_add_js('library/imagesloaded/imagesloaded.pkgd.min.js'); /** * Those who require this feature will know what to do with it. * Those who don't, won't. @@ -52,6 +53,6 @@ head_add_js('library/tableofcontents/jquery.toc.js'); * more of a proof of concept; but sufficient for our immediate needs. */ -$channel = get_app()->get_channel(); +$channel = App::get_channel(); if($channel && file_exists($channel['channel_address'] . '.js')) head_add_js('/' . $channel['channel_address'] . '.js'); |