aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/conf
diff options
context:
space:
mode:
authorPim van den Berg2014-06-28 16:10:02 +0200
committerPim van den Berg2014-06-28 16:15:00 +0200
commit056714a29721f1332f2497e440654f6735055d67 (patch)
tree741bc168cd6ff247d5cb5ff58ed5de8f96461cc5 /conf
parentMerge remote-tracking branch 'dhchen/master' (diff)
downloadapt-panopticon_cgp-056714a29721f1332f2497e440654f6735055d67.zip
apt-panopticon_cgp-056714a29721f1332f2497e440654f6735055d67.tar.gz
apt-panopticon_cgp-056714a29721f1332f2497e440654f6735055d67.tar.bz2
apt-panopticon_cgp-056714a29721f1332f2497e440654f6735055d67.tar.xz
type/base: replace array_merge by + sign to merge a fallback array
array_merge resets the index, while in case of $this->colors and $this->legend, we'd like to keep the index. An irq plugin sample: array(1 => 1, 'ERR' => 'ERR') must not become array(0 => 1, 'ERR' => 'ERR') after an array_merge.
Diffstat (limited to 'conf')
0 files changed, 0 insertions, 0 deletions