Commit 1c3279841f498c651952a52fdb782c4a5309b14c
1 parent
dbf47c7c
Exists in
master
and in
1 other branch
Gerente atualizado
- melhorias no código do instalador git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@271 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
instalador/classes/install.php
... | ... | @@ -56,7 +56,7 @@ class Install { |
56 | 56 | */ |
57 | 57 | function __construct() { |
58 | 58 | global $oTranslator; |
59 | - $this->oLang = $oTranslator; | |
59 | + $this->oLang = &$oTranslator; | |
60 | 60 | if(isset($_POST['cacic_config'])) { |
61 | 61 | $_SESSION['cacic_config'] = $_POST['cacic_config']; |
62 | 62 | $_SESSION['cacic_config']['path'] = CACIC_PATH; |
... | ... | @@ -69,7 +69,7 @@ class Install { |
69 | 69 | /* |
70 | 70 | * instacia objetos de classes externas |
71 | 71 | */ |
72 | - $this->oTmpl = new Template(); | |
72 | + $this->oTmpl = new Template($oTranslator); | |
73 | 73 | $this->oTmpl->header(); |
74 | 74 | $this->oTmpl->body(); |
75 | 75 | } | ... | ... |
instalador/classes/install.tmpl.php
... | ... | @@ -36,9 +36,8 @@ Class Template extends patTemplate { |
36 | 36 | var $oLang; |
37 | 37 | |
38 | 38 | |
39 | - function Template() { | |
40 | - global $oTranslator; | |
41 | - $this->oLang = $oTranslator; | |
39 | + function Template(&$_oTranslator) { | |
40 | + $this->oLang = &$_oTranslator; | |
42 | 41 | parent::patTemplate(); |
43 | 42 | $this->setNamespace('cacicInstall'); |
44 | 43 | $this->setRoot('templates'); |
... | ... | @@ -55,6 +54,7 @@ Class Template extends patTemplate { |
55 | 54 | $this->addVar('tmplPageHeader', 'CACIC_LANG_CHARSET', CACIC_LANG_CHARSET ); |
56 | 55 | $this->addVar('tmplPageHeader', 'CACIC_THEME', CACIC_THEME ); |
57 | 56 | $this->addVar('tmplPageHeader', 'CACIC_URL', CACIC_URL_INSTALL ); |
57 | + | |
58 | 58 | $this->displayParsedTemplate('tmplPageHeader'); |
59 | 59 | } |
60 | 60 | ... | ... |