[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[43609] branches/10.x

[<ar...@us...>]

Revision: 43609
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43609&view=rev
Author:   arildb
Date:     2012-10-23 12:46:21 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
[ROLLBACK][r43591,r43460,r43459] Tracking installation versions can be done in other ways, e.g. 
by using include_general.tpl in your templates/styles/yourstyle. db/local.php is also a candidate to store this info.
Rollback for now.

Revision Links:
--------------
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43591&view=rev
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43460&view=rev
    http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43459&view=rev

Modified Paths:
--------------
    branches/10.x/lib/setup/twversion.class.php
    branches/10.x/templates/admin/include_general.tpl
    branches/10.x/tiki-setup.php

Removed Paths:
-------------
    branches/10.x/install_version_php

Deleted: branches/10.x/install_version_php
===================================================================
--- branches/10.x/install_version_php	2012-10-23 12:00:46 UTC (rev 43608)
+++ branches/10.x/install_version_php	2012-10-23 12:46:21 UTC (rev 43609)
@@ -1,2 +0,0 @@
-<?php
-$CUSTOM_INSTALL_VERSION = null;	// or a text string e.g. "My Installation ver. 1.0"  

Modified: branches/10.x/lib/setup/twversion.class.php
===================================================================
--- branches/10.x/lib/setup/twversion.class.php	2012-10-23 12:00:46 UTC (rev 43608)
+++ branches/10.x/lib/setup/twversion.class.php	2012-10-23 12:46:21 UTC (rev 43609)
@@ -11,7 +11,6 @@
 {
 	public $branch;		// Development cycle
 	public $version;		// This version
-	public $install_version;	// Installation specific version
 	private $latestMinorRelease;		// Latest release in the same major version release series
 	public $latestRelease;		// Latest release
 	private $isLatestMajorVersion; // Whether or not the current major version is the latest
@@ -32,9 +31,6 @@
 		$this->star	= 'Sun';
 		$this->releases	= array();
 
-		// Custom installation version
-		$this->install_version = TWVersion::loadInstallVersion();
-
 		// Check for Subversion or not
 		$this->svn	= is_dir('.svn') ? 'y' : 'n';
 	}
@@ -243,12 +239,4 @@
 		$this->pollVersion();
 		return $this->latestMinorRelease == $this->version || version_compare($this->version, $this->latestRelease) == 1;
 	}
-
-	static function loadInstallVersion()
-	{
-		@include_once('install_version.php');
-		if(!empty($CUSTOM_INSTALL_VERSION))
-			return $CUSTOM_INSTALL_VERSION;
-		return null;
-	}
 }

Modified: branches/10.x/templates/admin/include_general.tpl
===================================================================
--- branches/10.x/templates/admin/include_general.tpl	2012-10-23 12:00:46 UTC (rev 43608)
+++ branches/10.x/templates/admin/include_general.tpl	2012-10-23 12:46:21 UTC (rev 43609)
@@ -20,14 +20,7 @@
 
 			<fieldset>
 				<legend>{tr}Release Check{/tr}</legend>
-				<div class="adminoptionbox">
-					{if isset($tiki_install_version)}
-						{tr}Installation:{/tr}
-						<strong>
-							{$tiki_install_version}
-						</strong>
-					{/if}
-					{tr}Tiki version:{/tr}
+				<div class="adminoptionbox">{tr}Tiki version:{/tr}
 					<strong>
 						{if !empty($lastup)}
 							{tr}Last update from SVN{/tr} ({$tiki_version}): {$lastup|tiki_long_datetime}

Modified: branches/10.x/tiki-setup.php
===================================================================
--- branches/10.x/tiki-setup.php	2012-10-23 12:00:46 UTC (rev 43608)
+++ branches/10.x/tiki-setup.php	2012-10-23 12:46:21 UTC (rev 43609)
@@ -265,7 +265,6 @@
 $smarty->assign('tiki_branch', $TWV->branch);
 $smarty->assign('tiki_star', $TWV->getStar());
 $smarty->assign('tiki_uses_svn', $TWV->svn);
-$smarty->assign('tiki_install_version', $TWV->install_version);
 
 if ( isset( $_GET['msg'] ) ) {
 	$smarty->assign('display_msg', $_GET['msg']);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.