aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-03-12 10:51:08 +0000
committerplegall <plg@piwigo.org>2005-03-12 10:51:08 +0000
commit13b6729e4f76e2a7854936000c8ed330271686f0 (patch)
tree127cb1648d9af9977748bf390c838f21fbe7f470
parente0c063279610aa595079353c01fdc6a734ef9597 (diff)
- no use of "realpath" function anymore : this function is too often buggy
and returns nothing (crash of template system as consequence...). The use of this function was not essential git-svn-id: http://piwigo.org/svn/trunk@749 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/functions.inc.php2
-rw-r--r--include/template.php2
-rw-r--r--install.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 52e0e0fa9..edc9f2062 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -260,7 +260,7 @@ function get_languages()
while ($file = readdir($dir))
{
- $path = realpath(PHPWG_ROOT_PATH.'language/'.$file);
+ $path = PHPWG_ROOT_PATH.'language/'.$file;
if (is_dir($path) and !is_link($path) and file_exists($path.'/iso.txt'))
{
list($language_name) = @file($path.'/iso.txt');
diff --git a/include/template.php b/include/template.php
index 32beecb9a..0c29ae3e7 100644
--- a/include/template.php
+++ b/include/template.php
@@ -271,7 +271,7 @@ class Template {
// Check if it's an absolute or relative path.
if (substr($filename, 0, 1) != '/')
{
- $filename = realpath($this->root . '/' . $filename);
+ $filename = $this->root.'/'.$filename;
}
if (!file_exists($filename))
diff --git a/install.php b/install.php
index 779fe279f..686a860e2 100644
--- a/install.php
+++ b/install.php
@@ -199,7 +199,7 @@ else
$language = guess_lang();
}
-if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/install.lang.php')) )
+if (!file_exists(PHPWG_ROOT_PATH.'language/'.$language.'/install.lang.php'))
{
$language = 'en_UK.iso-8859-1';
}