Changeset 5215
- Timestamp:
- Mar 21, 2010, 2:31:20 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/c13y_internal.class.php
r5207 r5215 84 84 null, 85 85 null, 86 sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']')86 sprintf(l10n('%s must be to set to false in your local/config/config.inc.php file'), '$conf[\''.$value.'\']') 87 87 .'<br>'. 88 88 $c13y->get_htlm_links_more_info()); -
trunk/include/common.inc.php
r5213 r5215 91 91 92 92 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 93 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');93 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 94 94 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); 95 95 -
trunk/include/config_default.inc.php
r5208 r5215 31 31 * It is recommended to let config_default.inc.php as provided and to 32 32 * overwrite configuration in your local configuration file 33 * config_local.inc.php. See tools/config_local.inc.php as an example.33 * local/config/config.inc.php. See tools/config.inc.php as an example. 34 34 * 35 35 * Why having some parameters in config table and others in -
trunk/install.php
r5213 r5215 159 159 $prefixeTable = $table_prefix; 160 160 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 161 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');161 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 162 162 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$dblayer.'.inc.php'); 163 163 include(PHPWG_ROOT_PATH . 'include/constants.php'); -
trunk/install/db/12-database.php
r5196 r5215 31 31 include_once(PHPWG_ROOT_PATH.'include/constants.php'); 32 32 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 33 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');33 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 34 34 35 35 // +-----------------------------------------------------------------------+ -
trunk/install/db/14-database.php
r5196 r5215 31 31 include_once(PHPWG_ROOT_PATH.'include/constants.php'); 32 32 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 33 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');33 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 34 34 35 35 // +-----------------------------------------------------------------------+ -
trunk/install/db/60-database.php
r5196 r5215 31 31 include_once(PHPWG_ROOT_PATH.'include/constants.php'); 32 32 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 33 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');33 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 34 34 35 35 // +-----------------------------------------------------------------------+ -
trunk/install/db/65-database.php
r5213 r5215 136 136 // get admin charset 137 137 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 138 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');138 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 139 139 $admin_charset='iso-8859-1'; 140 140 $query=' -
trunk/install/db/8-database.php
r5196 r5215 41 41 $conf_save = $conf; 42 42 unset($conf); 43 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');43 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 44 44 if ( isset($conf['gallery_url']) ) 45 45 { -
trunk/install/upgrade_1.4.0.php
r5196 r5215 283 283 $page['infos'], 284 284 'the thumbnail prefix configuration parameter was moved to configuration 285 file, copy config _local.inc.php from "tools" directory to "include" directory285 file, copy config.inc.php from "tools" directory to "local/config" directory 286 286 and edit $conf[\'prefix_thumbnail\'] = '.$prefix_thumbnail 287 287 ); -
trunk/install/upgrade_1.5.0.php
r5196 r5215 334 334 $conf_save = $conf; 335 335 unset($conf); 336 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');336 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 337 337 if ( isset($conf['gallery_url']) ) 338 338 { -
trunk/language/de_DE/admin.lang.php
r5209 r5215 536 536 $lang['the wiki'] = "das wiki"; 537 537 $lang['%s value is not correct file because exif are not supported'] = "Der Wert %s ist nicht korrekt weil EXIF nicht unterstützt wird"; 538 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s muss auf \"false\" in Ihrer Datei config_local.inc.php";538 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s muss auf \"false\" in Ihrer Datei local/config/config.inc.php"; 539 539 $lang['Main "guest" user does not exist'] = "Der Benutzer \"Gast\" Haupt nicht mehr"; 540 540 $lang['Main "guest" user status is incorrect'] = "Der Status der Benutzer \"Gast\" ist falsch"; -
trunk/language/en_UK/admin.lang.php
r5209 r5215 536 536 $lang['the wiki'] = "the wiki"; 537 537 $lang['%s value is not correct file because exif are not supported'] = "%s value is not correct file because exif are not supported"; 538 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s must be to set to false in your config_local.inc.php file";538 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s must be to set to false in your local/config/config.inc.php file"; 539 539 $lang['Main "guest" user does not exist'] = "Main \"guest\" user does not exist"; 540 540 $lang['Main "guest" user status is incorrect'] = "Main \"guest\" user status is incorrect"; -
trunk/language/es_ES/admin.lang.php
r5209 r5215 535 535 $lang['the wiki'] = "El wiki"; 536 536 $lang['%s value is not correct file because exif are not supported'] = "El valor de %s no es correcto porque datos Exif no son soportados"; 537 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s debe ser puesto a \"false\" en su fichero config_local.inc.php";537 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s debe ser puesto a \"false\" en su fichero local/config/config.inc.php"; 538 538 $lang['Main "guest" user does not exist'] = "El usuario \"invitado\" principal no existe más"; 539 539 $lang['Main "guest" user status is incorrect'] = "El estatuto del usuario \"invitado\" principal es incorrecto"; -
trunk/language/fr_FR/admin.lang.php
r5209 r5215 535 535 $lang['the wiki'] = "le wiki"; 536 536 $lang['%s value is not correct file because exif are not supported'] = "La valeur de %s n'est pas correcte parce que l'exif n'est pas supporté"; 537 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s doit être mis à \"false\" dans votre fichier config_local.inc.php";537 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s doit être mis à \"false\" dans votre fichier local/config/config.inc.php"; 538 538 $lang['Main "guest" user does not exist'] = "L'utilisateur \"invité\" principal n'existe plus"; 539 539 $lang['Main "guest" user status is incorrect'] = "Le statut de l'utilisateur \"invité\" principal est incorrect"; -
trunk/language/it_IT/admin.lang.php
r5209 r5215 535 535 $lang['the wiki'] = "il wiki"; 536 536 $lang['%s value is not correct file because exif are not supported'] = "Il valore di %s non è corretto per causa del exif che non è sopportato"; 537 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s deve essere impostato a \"false\" nel vostro file config_local.inc.php";537 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s deve essere impostato a \"false\" nel vostro file local/config/config.inc.php"; 538 538 $lang['Main "guest" user does not exist'] = "L'utente \"ospite\" principale non esiste più"; 539 539 $lang['Main "guest" user status is incorrect'] = "Lo statuto del'utente \"ospite\" principale non è corretto"; -
trunk/language/nl_NL/admin.lang.php
r5209 r5215 536 536 $lang['the wiki'] = "de wiki"; 537 537 $lang['%s value is not correct file because exif are not supported'] = "%s waarde is niet een correct bestand omdat exif niet ondersteund word"; 538 $lang['%s must be to set to false in your config_local.inc.php file'] = "%s moet aangepast worden naar false in je config_local.inc.php bestand";538 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "%s moet aangepast worden naar false in je local/config/config.inc.php bestand"; 539 539 $lang['Main "guest" user does not exist'] = "Hooft \"gast\" gebruiker bestaat niet meer"; 540 540 $lang['Main "guest" user status is incorrect'] = "Hooft \"gast\" gebruikers status is niet correct"; -
trunk/language/pl_PL/admin.lang.php
r5209 r5215 536 536 $lang['the wiki'] = "wiki"; 537 537 $lang['%s value is not correct file because exif are not supported'] = "Wartość %s nie jest poprawna, ponieważ exif nie jest wspierany"; 538 $lang['%s must be to set to false in your config_local.inc.php file'] = "Wartość %s musi być ustawiona na false w pliku konfiguracyjnym config_local.inc.php";538 $lang['%s must be to set to false in your local/config/config.inc.php file'] = "Wartość %s musi być ustawiona na false w pliku konfiguracyjnym local/config/config.inc.php"; 539 539 $lang['Main "guest" user does not exist'] = "Główny użytkownik \"gość\" nie istnieje"; 540 540 $lang['Main "guest" user status is incorrect'] = "Status głównego użytkownika \"gość\" jest niepoprawny"; -
trunk/language/templates/admin.lang.php
r5207 r5215 532 532 $lang['c13y_more_info_wiki'] = 'the wiki'; 533 533 $lang['c13y_exif_anomaly'] = '%s value is not correct file because exif are not supported'; 534 $lang['c13y_exif_correction'] = '%s must be to set to false in your config_local.inc.php file';534 $lang['c13y_exif_correction'] = '%s must be to set to false in your local/config/config.inc.php file'; 535 535 $lang['c13y_guest_non_existent'] = 'Main "guest" user does not exist'; 536 536 $lang['c13y_bad_guest_status'] = 'Main "guest" user status is incorrect'; -
trunk/plugins/LocalFilesEditor/admin.php
r5196 r5215 128 128 { 129 129 case 'localconf': 130 $edited_file = PHPWG_ROOT_PATH . " include/config_local.inc.php";130 $edited_file = PHPWG_ROOT_PATH . "local/config/config.inc.php"; 131 131 $content_file = file_exists($edited_file) ? 132 132 file_get_contents($edited_file) : $new_file['localconf']; -
trunk/upgrade.php
r5213 r5215 43 43 include(PHPWG_ROOT_PATH.'local/config/database.inc.php'); 44 44 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 45 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');45 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 46 46 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); 47 47 -
trunk/upgrade_feed.php
r5213 r5215 35 35 include(PHPWG_ROOT_PATH.'local/config/database.inc.php'); 36 36 include(PHPWG_ROOT_PATH . 'include/config_default.inc.php'); 37 @include(PHPWG_ROOT_PATH. ' include/config_local.inc.php');37 @include(PHPWG_ROOT_PATH. 'local/config/config.inc.php'); 38 38 include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php'); 39 39
Note: See TracChangeset
for help on using the changeset viewer.