Do not prepend $cfg['ThemePath'] with another './'.
This commit is contained in:
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
|
|||||||
$Id$
|
$Id$
|
||||||
$Source$
|
$Source$
|
||||||
|
|
||||||
|
2004-09-23 Michal Čihař <michal@cihar.com>
|
||||||
|
* themes.php, css/phpmyadmin.css.php, libraries/common.lib.php: Do not
|
||||||
|
prepend $cfg['ThemePath'] with another './'.
|
||||||
|
|
||||||
2004-09-22 Alexander M. Turek <me@derrabus.de>
|
2004-09-22 Alexander M. Turek <me@derrabus.de>
|
||||||
* config.inc.php, libraries/config_import.lib.php: Added "./" to the
|
* config.inc.php, libraries/config_import.lib.php: Added "./" to the
|
||||||
default value of $cfg['ThemePath']. Thanks to Donny Simonton for
|
default value of $cfg['ThemePath']. Thanks to Donny Simonton for
|
||||||
|
@@ -36,7 +36,7 @@ if ($js_frame == 'left') {
|
|||||||
************************************************************************************/
|
************************************************************************************/
|
||||||
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
||||||
// Check, if theme_left.css.php exists and include
|
// Check, if theme_left.css.php exists and include
|
||||||
$tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php';
|
$tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php';
|
||||||
if (@file_exists($tmp_file)) {
|
if (@file_exists($tmp_file)) {
|
||||||
include($tmp_file);
|
include($tmp_file);
|
||||||
} // end of include theme_left.css.php
|
} // end of include theme_left.css.php
|
||||||
@@ -46,7 +46,7 @@ if ($js_frame == 'left') {
|
|||||||
************************************************************************************/
|
************************************************************************************/
|
||||||
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
||||||
// Check, if theme_print.css.php exists and include
|
// Check, if theme_print.css.php exists and include
|
||||||
$tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_print.css.php';
|
$tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_print.css.php';
|
||||||
if (@file_exists($tmp_file)) {
|
if (@file_exists($tmp_file)) {
|
||||||
include($tmp_file);
|
include($tmp_file);
|
||||||
} // end of include theme_print.css.php
|
} // end of include theme_print.css.php
|
||||||
@@ -56,7 +56,7 @@ if ($js_frame == 'left') {
|
|||||||
************************************************************************************/
|
************************************************************************************/
|
||||||
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
// 2004-05-30: Michael Keck (mail@michaelkeck.de)
|
||||||
// Check, if theme_right.css.php exists and include
|
// Check, if theme_right.css.php exists and include
|
||||||
$tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_right.css.php';
|
$tmp_file = $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_right.css.php';
|
||||||
if (@file_exists($tmp_file)) {
|
if (@file_exists($tmp_file)) {
|
||||||
include($tmp_file);
|
include($tmp_file);
|
||||||
} // end of include theme_right.css.php
|
} // end of include theme_right.css.php
|
||||||
|
@@ -303,8 +303,8 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
|
|||||||
$GLOBALS['theme'] = $cfg['ThemeDefault'];
|
$GLOBALS['theme'] = $cfg['ThemeDefault'];
|
||||||
$ThemeDefaultOk = FALSE;
|
$ThemeDefaultOk = FALSE;
|
||||||
if ($cfg['ThemePath']!='' && $cfg['ThemePath'] != FALSE) {
|
if ($cfg['ThemePath']!='' && $cfg['ThemePath'] != FALSE) {
|
||||||
$tmp_theme_mainpath = './' . $cfg['ThemePath'];
|
$tmp_theme_mainpath = $cfg['ThemePath'];
|
||||||
$tmp_theme_fullpath = './' . $cfg['ThemePath'] . '/' .$cfg['ThemeDefault'];
|
$tmp_theme_fullpath = $cfg['ThemePath'] . '/' .$cfg['ThemeDefault'];
|
||||||
if (@is_dir($tmp_theme_mainpath)) {
|
if (@is_dir($tmp_theme_mainpath)) {
|
||||||
if (isset($cfg['ThemeDefault']) && @is_dir($tmp_theme_fullpath)) {
|
if (isset($cfg['ThemeDefault']) && @is_dir($tmp_theme_fullpath)) {
|
||||||
$ThemeDefaultOk = TRUE;
|
$ThemeDefaultOk = TRUE;
|
||||||
@@ -340,13 +340,13 @@ if ($theme_generation != PMA_THEME_GENERATION)
|
|||||||
if ($theme_version < PMA_THEME_VERSION)
|
if ($theme_version < PMA_THEME_VERSION)
|
||||||
$GLOBALS['theme'] = 'original'; // too old version
|
$GLOBALS['theme'] = 'original'; // too old version
|
||||||
|
|
||||||
$pmaThemeImage = './' . $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/img/';
|
$pmaThemeImage = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/img/';
|
||||||
$tmp_layout_file = './' . $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/layout.inc.php';
|
$tmp_layout_file = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/layout.inc.php';
|
||||||
if (@file_exists($tmp_layout_file)) {
|
if (@file_exists($tmp_layout_file)) {
|
||||||
include($tmp_layout_file);
|
include($tmp_layout_file);
|
||||||
}
|
}
|
||||||
if (!is_dir($pmaThemeImage)) {
|
if (!is_dir($pmaThemeImage)) {
|
||||||
$pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/';
|
$pmaThemeImage = $cfg['ThemePath'] . '/original/img/';
|
||||||
}
|
}
|
||||||
// end theme manager
|
// end theme manager
|
||||||
|
|
||||||
|
@@ -4,7 +4,7 @@ require_once('./libraries/grab_globals.lib.php');
|
|||||||
require_once('./libraries/common.lib.php');
|
require_once('./libraries/common.lib.php');
|
||||||
|
|
||||||
/* Theme Select */
|
/* Theme Select */
|
||||||
$path_to_themes = './' . $cfg['ThemePath'] . '/';
|
$path_to_themes = $cfg['ThemePath'] . '/';
|
||||||
require_once('./libraries/select_theme.lib.php');
|
require_once('./libraries/select_theme.lib.php');
|
||||||
|
|
||||||
/* set language and charset */
|
/* set language and charset */
|
||||||
|
Reference in New Issue
Block a user