Fixed bug in language include Removed workarounds

Marius Cramer

2013-11-21 82e2a20fdc6ff2edbc935502ddadffab2b6c7ce9

Fixed bug in language include
Removed workarounds

 interface/lib/classes/tform.inc.php

@@ -131,7 +131,7 @@
        $this->module = $module;
        $wb = array();

        include_once ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';
        include ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng';

        if(is_array($wb)) $wb_global = $wb;

@@ -146,7 +146,7 @@
        }

        if(is_array($wb_global)) {
            $wb = $app->functions->array_merge($wb_global, $wb);
            $wb = array_merge($wb_global, $wb);
        }
        if(isset($wb_global)) unset($wb_global);


 interface/web/client/client_edit.php

@@ -212,9 +212,6 @@
            }
        }
        
        $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
        $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));

        parent::onShowEnd();

    }

 interface/web/client/reseller_edit.php

@@ -159,9 +159,6 @@
            }
        }
        
        $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
        $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));

        parent::onShowEnd();

    }

 interface/web/sites/web_domain_edit.php

@@ -471,9 +471,6 @@
            }
        }

        $app->tpl->setVar('btn_save_txt',$app->lng('btn_save_txt'));
        $app->tpl->setVar('btn_cancel_txt',$app->lng('btn_cancel_txt'));
		
        parent::onShowEnd();
    }