aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/type
diff options
context:
space:
mode:
authorPim van den Berg2010-05-13 13:55:11 +0200
committerPim van den Berg2010-05-13 13:55:11 +0200
commit77366ad3e88ae3d8853d00014cee0ba3e3548afa (patch)
tree59129de831d535534ba189198afcfaa1a7730c2f /type
parentadd apache plugin (diff)
downloadapt-panopticon_cgp-77366ad3e88ae3d8853d00014cee0ba3e3548afa.zip
apt-panopticon_cgp-77366ad3e88ae3d8853d00014cee0ba3e3548afa.tar.gz
apt-panopticon_cgp-77366ad3e88ae3d8853d00014cee0ba3e3548afa.tar.bz2
apt-panopticon_cgp-77366ad3e88ae3d8853d00014cee0ba3e3548afa.tar.xz
fix: renumber keys of intersected array in function rrd_get_sources
Since commit 95c70c919 [rewrite of type classes] cpu graphs of hosts running a 2.4 Linux kernel or Solaris were not displayed. Function rrd_get_sources must return an array with a consecutive index of numbers.
Diffstat (limited to 'type')
-rw-r--r--type/Default.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/type/Default.class.php b/type/Default.class.php
index e3997de..20b2745 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -171,7 +171,7 @@ class Type_Default {
171 if (is_array($this->files) && count($this->files)>1) { 171 if (is_array($this->files) && count($this->files)>1) {
172 # and must it be ordered? 172 # and must it be ordered?
173 if (is_array($this->order)) { 173 if (is_array($this->order)) {
174 $this->tinstances = array_intersect($this->order, $this->tinstances); 174 $this->tinstances = array_merge(array_intersect($this->order, $this->tinstances));
175 } 175 }
176 # use tinstances as sources 176 # use tinstances as sources
177 if(is_array($this->data_sources) && count($this->data_sources)>1) { 177 if(is_array($this->data_sources) && count($this->data_sources)>1) {