Merge code from github to bitbucket 2014-08-14

This commit is contained in:
Julio Cesar Laura
2014-08-14 13:53:06 -04:00
37 changed files with 484 additions and 154 deletions

View File

@@ -30,6 +30,7 @@ class Admin extends Controller
$timeZonesList = array_keys( $timeZonesList );
$mainController = new Main();
$languagesList = $mainController->getLanguagesList();
$languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
$sysConf = System::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
foreach ($skinsList['skins'] as $skin) {