Show
Ignore:
Timestamp:
02/21/2008 07:27:27 PM (9 months ago)
Author:
Shadowhand
Message:

Merged r2083 and r2113 into releases/2.1.2

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • releases/2.1.2/system/controllers/template.php

    r1911 r2114  
    1818 
    1919        // Template view name 
    20         protected $template = 'template'; 
     20        public $template = 'template'; 
    2121 
    2222        // Default to no auto-rendering 
    23         protected $auto_render = TRUE; 
     23        public $auto_render = TRUE; 
    2424 
    2525        /**