Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21777
Modified Files:
serendipity_admin_installer.inc.php
serendipity_functions.inc.php
serendipity_functions_config.inc.php
serendipity_functions_installer.inc.php
Log Message:
The function serendipity_getTemplateFile() was made a requirement for the installer, but not defined in the scope of the installer.
The hotfix to include serendipity_functions.inc.php brought up other issues (missing dbType variable).
So now, the getTemplateFile() function is moved to serendipity_functions_config.inc.php and both required from serendipity_functions.inc.php as well as the installer/upgrader.
That should make all people happy. :-)
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- serendipity_admin_installer.inc.php 26 Aug 2004 09:13:35 -0000 1.76
+++ serendipity_admin_installer.inc.php 30 Aug 2004 09:13:58 -0000 1.77
@@ -5,8 +5,8 @@
@define('IN_installer', true);
require_once('serendipity_config.inc.php');
-require_once(S9Y_INCLUDE_PATH . 'serendipity_functions.inc.php');
require_once(S9Y_INCLUDE_PATH . 'serendipity_functions_installer.inc.php');
+require_once S9Y_INCLUDE_PATH . 'serendipity_functions_config.inc.php';
if (!isset($_POST['installAction'])) {
$_POST['installAction'] = '';
Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_functions_config.inc.php 26 May 2004 17:02:34 -0000 1.9
+++ serendipity_functions_config.inc.php 30 Aug 2004 09:13:59 -0000 1.10
@@ -77,5 +77,24 @@
}
}
+function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
+ global $serendipity;
+
+ $directories = array(
+ (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''),
+ $serendipity['defaultTemplate'] .'/',
+ 'default/'
+ );
+
+ foreach ($directories as $directory) {
+ $templateFile = $serendipity['templatePath'] . $directory . $file;
+
+ if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
+ return $serendipity[$key] . $templateFile;
+ }
+ }
+ return false;
+}
+
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_functions_installer.inc.php 28 Aug 2004 15:14:52 -0000 1.33
+++ serendipity_functions_installer.inc.php 30 Aug 2004 09:13:59 -0000 1.34
@@ -570,8 +570,6 @@
)";
serendipity_db_query($query);
- include_once S9Y_INCLUDE_PATH . 'serendipity_functions_config.inc.php';
-
$serendipity['dbPrefix'] = $_POST['dbPrefix'];
/* Set the default template */
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -d -r1.407 -r1.408
--- serendipity_functions.inc.php 28 Aug 2004 21:50:59 -0000 1.407
+++ serendipity_functions.inc.php 30 Aug 2004 09:13:58 -0000 1.408
@@ -116,25 +116,6 @@
<?php
}
-function serendipity_getTemplateFile($file, $key = 'serendipityHTTPPath') {
- global $serendipity;
-
- $directories = array(
- (isset($serendipity['template']) ? $serendipity['template'] . '/' : ''),
- $serendipity['defaultTemplate'] .'/',
- 'default/'
- );
-
- foreach ($directories as $directory) {
- $templateFile = $serendipity['templatePath'] . $directory . $file;
-
- if (file_exists($serendipity['serendipityPath'] . $templateFile)) {
- return $serendipity[$key] . $templateFile;
- }
- }
- return false;
-}
-
function serendipity_fetchTemplates() {
global $serendipity;
$dir = opendir($serendipity['serendipityPath'] . $serendipity['templatePath']);
|
