Merge
This commit is contained in:
commit
5efa0315d6
6 changed files with 15 additions and 5 deletions
13
.hgignore
13
.hgignore
|
@ -9,8 +9,6 @@ ReleaseDebug
|
|||
DebugFast
|
||||
ReleaseDebugStatic
|
||||
DebugFastStatic
|
||||
nel_tools_win*
|
||||
ryzom_tools_win*
|
||||
|
||||
# Test and application directories
|
||||
screenshots
|
||||
|
@ -228,3 +226,14 @@ code\ryzom\tools\server\ryzom_ams\old
|
|||
|
||||
# AMS ignore
|
||||
code/ryzom/tools/server/ryzom_ams/www/config.php
|
||||
|
||||
#tools and external dir's
|
||||
external
|
||||
external_stlport
|
||||
nel_tools*
|
||||
ryzom_tools*
|
||||
|
||||
#Dumps
|
||||
*.dmp
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class Helpers{
|
|||
$smarty -> debugging = false;
|
||||
// caching must be disabled for multi-language support
|
||||
$smarty -> caching = false;
|
||||
$smarty -> cache_lifetime = 120;
|
||||
$smarty -> cache_lifetime = 5;
|
||||
|
||||
//needed by smarty.
|
||||
helpers :: create_folders ();
|
||||
|
|
|
@ -95,8 +95,8 @@ $AMS_CACHEDIR = $AMS_LIB . '/cache';
|
|||
$SITEBASE = dirname( __FILE__ ) . '/html/' ;
|
||||
|
||||
//the paths to your website url
|
||||
$BASE_WEBPATH = dirname($_SERVER['PHP_SELF']);
|
||||
$IMAGELOC_WEBPATH = $_SERVER['REQUEST_URI'].'/img';
|
||||
$BASE_WEBPATH = '';
|
||||
$IMAGELOC_WEBPATH = $BASE_WEBPATH.'img';
|
||||
$WEBPATH = $BASE_WEBPATH . '/index.php';
|
||||
$INGAME_WEBPATH = $BASE_WEBPATH . '/index.php';
|
||||
$CONFIG_PATH = dirname( __FILE__ );
|
||||
|
|
0
code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder
vendored
Normal file
0
code/ryzom/tools/server/ryzom_ams/www/html/cache/placeholder
vendored
Normal file
|
@ -13,6 +13,7 @@
|
|||
error_reporting( E_ALL );
|
||||
|
||||
$return = array();
|
||||
$return['no_visible_elements'] = false;
|
||||
|
||||
helpers :: loadTemplate( "install" , $return );
|
||||
exit;
|
||||
|
|
Loading…
Reference in a new issue