mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

also copy baseURL if defaultBaseURL empty but set

Browse Source
This commit is contained in:
onli 2013-05-14 15:31:06 +02:00
parent 84eff93dec
commit 78f044c421
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/admin/upgrader.inc.php
View File

@ -168,7 +168,7 @@ $tasks = array(array('version' => '0.5.1',
All internal and spartacus templates have been updated, so make sure you are using a recent version of your blog\'s template.
If you have your own custom template, be sure within your {foreach from=$dategroup.entries item="entry"} loop has this line after it:
<strong>{assign var="entry" value=$entry scope="parent"}</strong>'),
array('version' => '1.7',
array('version' => '1.7.1',
'function' => 'serendipity_copyBaseURL',
'title' => 'Copy baseURL',
'desc' => 'The baseURL option was moved to the defaultBaseURL-Option in the backend-configuration. To reflect that change in the database and to prevent future bugs, baseURL should copied to defaultBaseURL if that options is not set already.'),

2
include/functions_config.inc.php
View File

@ -330,7 +330,7 @@ function serendipity_load_configuration($author = null) {
$config_loaded[$author] = true;
// Set baseURL to defaultBaseURL
if ((empty($author) || empty($serendipity['baseURL'])) && isset($serendipity['defaultBaseURL'])) {
if ((empty($author) || empty($serendipity['baseURL'])) && (! empty($serendipity['defaultBaseURL']))) {
$serendipity['baseURL'] = $serendipity['defaultBaseURL'];
}

2
include/functions_upgrader.inc.php
View File

@ -161,7 +161,7 @@ function serendipity_addDefaultGroups() {
* */
function serendipity_copyBaseURL() {
global $serendipity;
if (serendipity_get_config_var("defaultBaseURL") === false && serendipity_get_config_var("baseURL") !== false ) {
if ((serendipity_get_config_var("defaultBaseURL") === false || serendipity_get_config_var("defaultBaseURL") == "" ) && serendipity_get_config_var("baseURL") !== false) {
serendipity_set_config_var("defaultBaseURL", serendipity_get_config_var("baseURL"));
}
}