Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2090) +++ branches/2.8.x/CHANGELOG (revision 2091) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +20 Jan-2014 Build 2090 Manuela v.d.Decken(DarkViper) +! several Files: corrected case sensitivity of ::getInstance() 19 Jan-2014 Build 2089 Manuela v.d.Decken(DarkViper) ! UpgradeHelper: added method delTree() - templates/argos_theme Index: branches/2.8.x/wb/admin/groups/index.php =================================================================== --- branches/2.8.x/wb/admin/groups/index.php (revision 2090) +++ branches/2.8.x/wb/admin/groups/index.php (revision 2091) @@ -20,7 +20,7 @@ function admin_groups_index() { $database = WbDatabase::getInstance(); - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); $mLang->enableAddon('admin\groups'); $mod_path = dirname(str_replace('\\', '/', __FILE__)); Index: branches/2.8.x/wb/admin/templates/details.php =================================================================== --- branches/2.8.x/wb/admin/templates/details.php (revision 2090) +++ branches/2.8.x/wb/admin/templates/details.php (revision 2091) @@ -17,7 +17,7 @@ // Include the config file require('../../config.php'); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); require_once(WB_PATH .'/framework/functions.php'); require_once(WB_PATH.'/framework/class.admin.php'); Index: branches/2.8.x/wb/admin/templates/index.php =================================================================== --- branches/2.8.x/wb/admin/templates/index.php (revision 2090) +++ branches/2.8.x/wb/admin/templates/index.php (revision 2091) @@ -55,7 +55,7 @@ //$mLang = ModLanguage::getInstance(); //$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 2090) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 2091) @@ -88,7 +88,7 @@ /* -------------------------------------------------------------------------------------*/ // $mLang = ModLanguage::getInstance(); // $mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); $mLang->enableAddon('admin\pages'); $oDb = WbDatabase::getInstance(); $sDisabled = ' disabled="disabled"'; Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 2090) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 2091) @@ -39,7 +39,7 @@ $admin = new admin('Pages', 'pages_view', false); // Include the WB functions file if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); } -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\pages'); $oDb = WbDatabase::getInstance(); $action = 'show'; Index: branches/2.8.x/wb/admin/pages/add.php =================================================================== --- branches/2.8.x/wb/admin/pages/add.php (revision 2090) +++ branches/2.8.x/wb/admin/pages/add.php (revision 2091) @@ -27,7 +27,7 @@ if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); } $oReg = WbAdaptor::getInstance(); $oDb = WbDatabase::getInstance(); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\pages'); // suppress to print the header, so no new FTAN will be set Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2090) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2091) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2089'); +if(!defined('REVISION')) define('REVISION', '2090'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/settings/index.php =================================================================== --- branches/2.8.x/wb/admin/settings/index.php (revision 2090) +++ branches/2.8.x/wb/admin/settings/index.php (revision 2091) @@ -57,7 +57,7 @@ //$mLang = ModLanguage::getInstance(); //$mLang->setLanguage(dirname(__FILE__).'/languages/', LANGUAGE, DEFAULT_LANGUAGE); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\settings'); /*-- insert all needed vars from language files ----------------------------------------*/ $oTpl->set_var($mLang->getLangArray()); Index: branches/2.8.x/wb/admin/users/index.php =================================================================== --- branches/2.8.x/wb/admin/users/index.php (revision 2090) +++ branches/2.8.x/wb/admin/users/index.php (revision 2091) @@ -34,7 +34,7 @@ function admin_users_index($aActionRequest) { $database = WbDatabase::getInstance(); - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); $mLang->enableAddon('admin\users'); $sAdminPath = dirname(str_replace('\\', '/', __FILE__)); Index: branches/2.8.x/wb/admin/preferences/index.php =================================================================== --- branches/2.8.x/wb/admin/preferences/index.php (revision 2090) +++ branches/2.8.x/wb/admin/preferences/index.php (revision 2091) @@ -23,7 +23,7 @@ function build_page( &$admin, &$database ) { // global $HEADING, $TEXT; - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); $oReg = WbAdaptor::getInstance(); include_once(WB_PATH.'/framework/functions-utf8.php'); // Setup template object, parse vars to it, then parse it @@ -32,7 +32,7 @@ $template = new Template(dirname($admin->correct_theme_source('preferences.htt'))); $template->set_file( 'page', 'preferences.htt' ); $template->set_block( 'page', 'main_block', 'main' ); - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); // $mLang->enableAddon('admin\preferences'); $template->set_var($mLang->getLangArray()); Index: branches/2.8.x/wb/admin/languages/details.php =================================================================== --- branches/2.8.x/wb/admin/languages/details.php (revision 2090) +++ branches/2.8.x/wb/admin/languages/details.php (revision 2091) @@ -20,7 +20,7 @@ function getInfoFromLanguageFile($sFile) { $mRetval = array(); - $mLang = Translate::getinstance(); + $mLang = Translate::getInstance(); $oReg = WbAdaptor::getInstance(); // check for valid language code if(preg_match('/^([A-Z]{2}.php)/', $sFile)) { @@ -47,7 +47,7 @@ // Include the config code require('../../config.php'); // Print admin header -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Addons', 'languages_view', false); Index: branches/2.8.x/wb/admin/languages/index.php =================================================================== --- branches/2.8.x/wb/admin/languages/index.php (revision 2090) +++ branches/2.8.x/wb/admin/languages/index.php (revision 2091) @@ -52,7 +52,7 @@ //$mLang = ModLanguage::getInstance(); //$mLang->setLanguage(ADMIN_PATH.'/addons/languages/', LANGUAGE, DEFAULT_LANGUAGE); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); /*-- insert all needed vars from language files ----------------------------------------*/ Index: branches/2.8.x/wb/admin/modules/details.php =================================================================== --- branches/2.8.x/wb/admin/modules/details.php (revision 2090) +++ branches/2.8.x/wb/admin/modules/details.php (revision 2091) @@ -17,7 +17,7 @@ // Include the config file require('../../config.php'); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); require_once(WB_PATH .'/framework/functions.php'); require_once(WB_PATH.'/framework/class.admin.php'); Index: branches/2.8.x/wb/admin/modules/index.php =================================================================== --- branches/2.8.x/wb/admin/modules/index.php (revision 2090) +++ branches/2.8.x/wb/admin/modules/index.php (revision 2091) @@ -27,7 +27,7 @@ // Make news post access files dir if(!function_exists('get_variable_content')) {require($oReg->AppPath.'framework/functions.php');} $oReg->getWbConstants(); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('admin\addons'); // Setup template object, parse vars to it, then parse it Index: branches/2.8.x/wb/account/confirm.php =================================================================== --- branches/2.8.x/wb/account/confirm.php (revision 2090) +++ branches/2.8.x/wb/account/confirm.php (revision 2091) @@ -30,7 +30,7 @@ require_once($config_file); } -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('account'); if(!class_exists('frontend', false)){ include(WB_PATH.'/framework/class.frontend.php'); } Index: branches/2.8.x/wb/account/preferences_form.php =================================================================== --- branches/2.8.x/wb/account/preferences_form.php (revision 2090) +++ branches/2.8.x/wb/account/preferences_form.php (revision 2091) @@ -24,7 +24,7 @@ /* -------------------------------------------------------- */ $oReg = WbAdaptor::getInstance(); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); if($wb->is_authenticated() === false) { // User needs to login first Index: branches/2.8.x/wb/account/signup_form.php =================================================================== --- branches/2.8.x/wb/account/signup_form.php (revision 2090) +++ branches/2.8.x/wb/account/signup_form.php (revision 2091) @@ -30,7 +30,7 @@ require_once(WB_PATH.'/include/captcha/captcha.php'); include_once (WB_PATH.'/framework/functions.php'); -$mLang = Translate::getinstance(); +$mLang = Translate::getInstance(); $mLang->enableAddon('account'); $oDb = WbDatabase::getInstance(); $oReg = WbAdaptor::getInstance(); Index: branches/2.8.x/wb/modules/news/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/news/upgrade.php (revision 2090) +++ branches/2.8.x/wb/modules/news/upgrade.php (revision 2091) @@ -53,7 +53,7 @@ global $OK ,$FAIL; $aMandatoryTables = array('mod_news_posts','mod_news_groups','mod_news_comments','mod_news_settings'); $oDb = WbDatabase::getInstance(); - $oLang = Translate::getinstance(); + $oLang = Translate::getInstance(); $oReg = WbAdaptor::getInstance(); $msg = array(); $sCallingScript = $_SERVER['SCRIPT_NAME'];