[Fmsystem-commits] [6783] setup: fix update translations

[Sigurd Nes]

Revision: 6783
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6783
Author:   sigurdne
Date:     2011-01-16 15:20:24 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
setup: fix update translations

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.setup.inc.php
    trunk/phpgwapi/inc/class.setup_process.inc.php
    trunk/phpgwapi/inc/class.translation.inc.php

Modified: trunk/phpgwapi/inc/class.setup.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup.inc.php      2011-01-15 23:52:04 UTC (rev 
6782)
+++ trunk/phpgwapi/inc/class.setup.inc.php      2011-01-16 15:20:24 UTC (rev 
6783)
@@ -18,7 +18,7 @@
        * @package phpgwapi
        * @subpackage application
        */
-       class setup
+       class phpgwapi_setup
        {
                var $db;
                var $oProc;
@@ -35,7 +35,7 @@
                var $tbl_config;
                var $tbl_hooks;
 
-               function setup($html = False, $translation = False)
+               public function __construct($html = False, $translation = False)
                {
                        $this->detection = 
createObject('phpgwapi.setup_detection');
                        $this->process   = 
createObject('phpgwapi.setup_process');

Modified: trunk/phpgwapi/inc/class.setup_process.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.setup_process.inc.php      2011-01-15 23:52:04 UTC 
(rev 6782)
+++ trunk/phpgwapi/inc/class.setup_process.inc.php      2011-01-16 15:20:24 UTC 
(rev 6783)
@@ -23,14 +23,14 @@
        * V : Version mismatch at end of upgrade (Not used, proposed only)
        * M : Missing files at start of upgrade (Not used, proposed only)
        */
-       class setup_process
+       class phpgwapi_setup_process
        {
                var $oProc;
                var $tables;
                var $updateincluded = array();
                var $translation;
 
-               function setup_process()
+               function __construct()
                {
                        $this->translation = 
createObject('phpgwapi.setup_translation');
                }

Modified: trunk/phpgwapi/inc/class.translation.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.translation.inc.php        2011-01-15 23:52:04 UTC 
(rev 6782)
+++ trunk/phpgwapi/inc/class.translation.inc.php        2011-01-16 15:20:24 UTC 
(rev 6783)
@@ -338,9 +338,12 @@
 
                        if (count($lang_selected))
                        {
-                               $GLOBALS['phpgw']->db->query("SELECT 
config_value FROM phpgw_config WHERE config_app='phpgwapi' AND 
config_name='install_id'",__LINE__,__FILE__);
-                               $GLOBALS['phpgw']->db->next_record();
-                               $GLOBALS['phpgw_info']['server']['install_id'] 
= $GLOBALS['phpgw']->db->f('config_value', true);
+                               $c = createObject('phpgwapi.config','phpgwapi');
+                               $c->read();
+                               foreach ($c->config_data as $k => $v)
+                               {
+                                       $GLOBALS['phpgw_info']['server'][$k] = 
$v;
+                               }
 
                                if ($upgrademethod == 'dumpold')
                                {