From a61b3b65fbe3f747250fdb737de5649730c27a8f Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 20 Oct 2009 09:14:30 +0000
Subject: [PATCH] Remove 'version' option.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1879 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/config.php | 3 +--
lib/SimpleSAML/Utilities.php | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/config-templates/config.php b/config-templates/config.php
index 41b185a50..8d871e9f2 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -37,8 +37,7 @@ $config = array (
*/
'tempdir' => '/tmp/simplesaml',
- 'version' => 'trunk',
-
+
/**
* If you set the debug parameter to true, all SAML messages will be visible in the
* browser, and require the user to click the submit button. If debug is set to false,
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 99e16c82b..f3d8822ab 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -625,7 +625,7 @@ class SimpleSAML_Utilities {
$t->data['trackid'] = $trackid;
- $t->data['version'] = $config->getString('version', 'na');
+ $t->data['version'] = $config->getVersion();
$t->data['url'] = self::selfURLNoQuery();
$t->show();
--
GitLab