Changeset 1088

Show
Ignore:
Timestamp:
11/11/2007 01:55:11 AM (13 months ago)
Author:
Shadowhand
Message:

I should do what I say I am going to do... Follow up to r1084.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/system/libraries/View.php

    r1084 r1088  
    4242                } 
    4343 
    44                 // Preload data 
    4544                if (is_array($data) AND ! empty($data)) 
    4645                { 
    47                         $this->data = $data; 
     46                        // Preload data using array_merge, to allow user extensions 
     47                        $this->data = array_merge($this->data, $data); 
    4848                } 
    4949