smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 19:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty config_path.

Browse Source
This commit is contained in:
andrey
2001-05-31 14:29:49 +00:00
parent a0f60bb4c9
commit cd9b09a811
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Config_File.class.php
View File

@@ -89,8 +89,7 @@ class Config_File extends PEAR {
function set_path($config_path) function set_path($config_path)
{ {
if (!is_string($config_path) || if (!is_string($config_path) ||
($config_path != "" (!is_dir($config_path))) {
&& !is_dir($config_path))) {
return new Config_File_Error("Bad config file path '$config_path'"); return new Config_File_Error("Bad config file path '$config_path'");
} }
@@ -113,8 +112,7 @@ class Config_File extends PEAR {
if (empty($file_name)) if (empty($file_name))
return new Config_File_Error('Empty config file name'); return new Config_File_Error('Empty config file name');
else { else {
if ($this->_config_path != "") $file_name = $this->_config_path . $file_name;
$file_name = $this->_config_path . $this->_separator . $file_name;
if (!isset($this->_config_data[$file_name])) if (!isset($this->_config_data[$file_name]))
$this->load_file($file_name, false); $this->load_file($file_name, false);
} }
@@ -170,8 +168,7 @@ class Config_File extends PEAR {
*/ */
function get_section_names($file_name) function get_section_names($file_name)
{ {
if ($this->_config_path != "") $file_name = $this->_config_path . $file_name;
$file_name = $this->_config_path . $this->_separator . $file_name;
if (!isset($this->_config_data[$file_name])) if (!isset($this->_config_data[$file_name]))
return new Config_File_Error("Unknown config file '$file_name'"); return new Config_File_Error("Unknown config file '$file_name'");
@@ -228,7 +225,7 @@ class Config_File extends PEAR {
global $php_errormsg; global $php_errormsg;
if ($prepend_path && $this->_config_path != "") if ($prepend_path && $this->_config_path != "")
$config_file = $this->_config_path . $this->_separator . $file_name; $config_file = $this->_config_path . $file_name;
else else
$config_file = $file_name; $config_file = $file_name;

11
libs/Config_File.class.php
View File

@@ -89,8 +89,7 @@ class Config_File extends PEAR {
function set_path($config_path) function set_path($config_path)
{ {
if (!is_string($config_path) || if (!is_string($config_path) ||
($config_path != "" (!is_dir($config_path))) {
&& !is_dir($config_path))) {
return new Config_File_Error("Bad config file path '$config_path'"); return new Config_File_Error("Bad config file path '$config_path'");
} }
@@ -113,8 +112,7 @@ class Config_File extends PEAR {
if (empty($file_name)) if (empty($file_name))
return new Config_File_Error('Empty config file name'); return new Config_File_Error('Empty config file name');
else { else {
if ($this->_config_path != "") $file_name = $this->_config_path . $file_name;
$file_name = $this->_config_path . $this->_separator . $file_name;
if (!isset($this->_config_data[$file_name])) if (!isset($this->_config_data[$file_name]))
$this->load_file($file_name, false); $this->load_file($file_name, false);
} }
@@ -170,8 +168,7 @@ class Config_File extends PEAR {
*/ */
function get_section_names($file_name) function get_section_names($file_name)
{ {
if ($this->_config_path != "") $file_name = $this->_config_path . $file_name;
$file_name = $this->_config_path . $this->_separator . $file_name;
if (!isset($this->_config_data[$file_name])) if (!isset($this->_config_data[$file_name]))
return new Config_File_Error("Unknown config file '$file_name'"); return new Config_File_Error("Unknown config file '$file_name'");
@@ -228,7 +225,7 @@ class Config_File extends PEAR {
global $php_errormsg; global $php_errormsg;
if ($prepend_path && $this->_config_path != "") if ($prepend_path && $this->_config_path != "")
$config_file = $this->_config_path . $this->_separator . $file_name; $config_file = $this->_config_path . $file_name;
else else
$config_file = $file_name; $config_file = $file_name;