nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of the uninitialised $c->pkgver variable.

Browse Source
This commit is contained in:
Andrew McMillan 2007-10-24 21:42:25 +13:00
parent 5c2358ccd4
commit b42f3d4aef
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/always.php
View File

@ -83,12 +83,12 @@ $c->code_version = 0;
$c->version_string = '0.9.0'; // The actual version # is replaced into that during the build /release process $c->version_string = '0.9.0'; // The actual version # is replaced into that during the build /release process
if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) { if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
$c->code_major = $matches[1]; $c->code_major = $matches[1];
$c->code_minor = $matches[1]; $c->code_minor = $matches[2];
$c->code_patch = $matches[1]; $c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch; $c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch;
} }
dbg_error_log("caldav", "Version %s (%d.%d.%d) == %s", $c->code_pkgver, $c->code_major, $c->code_minor, $c->code_patch, $c->code_version); dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %s/%d.%d", $c->code_pkgver, $c->code_major, $c->code_minor) ); header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
/** /**
* Force the domain name to what was in the configuration file * Force the domain name to what was in the configuration file

4
inc/always.php.in
View File

@ -87,8 +87,8 @@ if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->v
$c->code_patch = $matches[3]; $c->code_patch = $matches[3];
$c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch; $c->code_version = (($c->code_major * 1000) + $c->code_minor).".".$c->code_patch;
} }
dbg_error_log("caldav", "Version %s (%d.%d.%d) == %s", $c->code_pkgver, $c->code_major, $c->code_minor, $c->code_patch, $c->code_version); dbg_error_log("caldav", "Version (%d.%d.%d) == %s", $c->code_major, $c->code_minor, $c->code_patch, $c->code_version);
header( sprintf("Server: %s/%d.%d", $c->code_pkgver, $c->code_major, $c->code_minor) ); header( sprintf("Server: %d.%d", $c->code_major, $c->code_minor) );
/** /**
* Force the domain name to what was in the configuration file * Force the domain name to what was in the configuration file