aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/views.php
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-10-19 09:47:11 +0200
committerSem <sembrestels@riseup.net>2012-10-19 09:47:11 +0200
commit80ca3d447737a679f773cbea7e788ee190abea69 (patch)
tree62bd6ec58b5fc8ad02bd529d187591659dc39b65 /engine/lib/views.php
parent9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff)
parentd134beadb79fcc90a75bda8bbcbfb9987b27470c (diff)
downloadelgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz
elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'engine/lib/views.php')
-rw-r--r--engine/lib/views.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index b00334062..6135026a7 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1653,7 +1653,7 @@ function elgg_views_boot() {
}
// set default icon sizes - can be overridden in settings.php or with plugin
- if (!elgg_get_config('icon_sizes')) {
+ if (!$CONFIG->icon_sizes) {
$icon_sizes = array(
'topbar' => array('w' => 16, 'h' => 16, 'square' => TRUE, 'upscale' => TRUE),
'tiny' => array('w' => 25, 'h' => 25, 'square' => TRUE, 'upscale' => TRUE),