Thread: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13915] trunk (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 13915
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13915&view=rev
Author:   lphuberdeau
Date:     2008-07-28 14:58:28 +0000 (Mon, 28 Jul 2008)

Log Message:
-----------
[MRG] Automatic merge, branches/2.0 13877 to 13914

Modified Paths:
--------------
    trunk/fgal_listing_conf.php
    trunk/installer/tiki-installer.php
    trunk/lib/admin/adminlib.php
    trunk/lib/csslib.php
    trunk/lib/setup/tikisetup.class.php
    trunk/lib/setup/twversion.class.php
    trunk/lib/smarty_tiki/function.tree.php
    trunk/lib/tikilib.php
    trunk/styles/darkroom.css
    trunk/styles/feb12.css
    trunk/styles/tikinewt.css
    trunk/styles/transitions/1.9to2.0.css
    trunk/templates/comments.tpl
    trunk/templates/tiki-admin-include-look.tpl
    trunk/tiki-install.php
    trunk/tiki-setup.php

Modified: trunk/fgal_listing_conf.php
===================================================================

--- trunk/fgal_listing_conf.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/fgal_listing_conf.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -61,7 +61,7 @@
 	$k_prefs = 'fgal_'.$k_gal;
 
 	// Only check the current gallery value if the feature (in global prefs) is enabled
-	$fgal_options[$k_gal]['value'] = ( $prefs[$k_prefs] == 'y' && isset($gal_info) ) ? $gal_info[$k_gal] : $prefs[$k_prefs];
+	$fgal_options[$k_gal]['value'] = ( $prefs[$k_prefs] == 'y' && isset($gal_info) && isset($gal_info[$k_gal]) ) ? $gal_info[$k_gal] : $prefs[$k_prefs];
 }
 
 $smarty->assign_by_ref('fgal_options', $fgal_options);

Modified: trunk/installer/tiki-installer.php
===================================================================
--- trunk/installer/tiki-installer.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/installer/tiki-installer.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -366,7 +366,7 @@
 
 	a) To run setup.sh, follow the instructions:
 		\$ cd $docroot
-		\$ sh ./setup.sh
+		\$ sh setup.sh
 
 		The script will offer you options depending on your server configuration.
 

Modified: trunk/lib/admin/adminlib.php
===================================================================
--- trunk/lib/admin/adminlib.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/admin/adminlib.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -396,11 +396,11 @@
 	}
 
 	function list_content_tables() {
-		global $dbversion_tiki;
+		global $TWV;
 	   // this function lists all tables and fields that hold textual content.
 	   // used in System Admin -> Fix UTF-8 Errors.
 
-	   $tikisql=file('db/tiki-'.$dbversion_tiki.'-mysql.sql');
+	   $tikisql=file('db/tiki-'.$TWV->getBaseVersion().'-mysql.sql');
 	   $tabfields=array();
 	   foreach($tikisql as $item) {
 	      if(preg_match('/^CREATE TABLE ([a-zA-Z0-9_]+)/',$item,$tmatch)) {

Modified: trunk/lib/csslib.php
===================================================================
--- trunk/lib/csslib.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/csslib.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -159,12 +159,13 @@
 	 *  @TODO: return empty string if CSS file is /newer/ than db version?
 	 */
 	function transition_css($path, $default_ver='1.9') {
-		global $dbversion_tiki;
+		global $TWV;
+
 		$cssversion = $this->version_css($path);
 		// assume default_ver if no @version string
 		$cssversion = $cssversion ? $cssversion : $default_ver;
 		if( $dbversion_tiki == $cssversion || !$cssversion ) { return ''; }
-		return $cssversion."to".$dbversion_tiki.".css";
+		return $cssversion."to".$TWV->getBaseVersion().".css";
 	}
 }
 global $dbTiki;

Modified: trunk/lib/setup/tikisetup.class.php
===================================================================
--- trunk/lib/setup/tikisetup.class.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/setup/tikisetup.class.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -144,8 +144,7 @@
 		a) Run setup.sh and follow the instructions:
 			\$ bash
 			\$ cd $docroot
-			\$ chmod +x setup.sh
-			\$ ./setup.sh
+			\$ sh setup.sh
 
 		The script will offer you options depending on your server configuration.
 

Modified: trunk/lib/setup/twversion.class.php
===================================================================
--- trunk/lib/setup/twversion.class.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/setup/twversion.class.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -40,6 +40,12 @@
 		// Check for CVS or not
 		$this->cvs	= is_dir('CVS') ? 'y' : 'n';
 	}
+
+	function getBaseVersion()
+	{
+		return preg_replace( "/^(\d+\.\d+).*$/", '$1', $this->version );
+	}
+
 	// Returns an array of all used Tiki stars.
 	function tikiStars() {
 		return array(

Modified: trunk/lib/smarty_tiki/function.tree.php
===================================================================
--- trunk/lib/smarty_tiki/function.tree.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/smarty_tiki/function.tree.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -65,27 +65,34 @@
 		$structure = data2struct($params['data'], 1, $expanded);
 	}
 
-	if ( $prefs['javascript_enabled'] == 'y' ) {
+	$default_expand = $params['expanded'];
+	$phplm_expand = '';
 
-		// Update cookie that stores tree elements that should be expanded
-		//   by keeping those already expanded by the user and those that should now be expanded ($params['expanded'])
-		//
-		if ( isset($_COOKIE) && isset($_COOKIE['phplm_expand']) && $_COOKIE['phplm_expand'] != '' ) {
-			$phplm_expand = implode('|', array_unique(array_merge($params['expanded'], explode('|', $_COOKIE['phplm_expand']))));
-			if ( ! headers_sent() ) {
-				// Not using php's setcookie function because pipes '|' are converted to %7C
-				//   and are no more understood by PHP Layers javacript
-				header('Set-Cookie: phplm_expand='.$phplm_expand.'; path=/');
-			}
-		}
-	
-		// Reset cookie that stores tree elements collapsed by the user, in order
-		//   to be sure every elements of $params['expanded'] are really expanded
-		//
-		setcookie('phplm_collapse', '', false, '/');
+	// Update cookie that stores tree elements that should be expanded
+	//   by keeping those already expanded by the user and those that should now be expanded ($params['expanded'])
+	//
+	if ( isset($_COOKIE) && isset($_COOKIE['phplm_expand']) && ereg('^[0-9\|]+$', $_COOKIE['phplm_expand']) ) {
+		// Get user choices stored in Cookies from this script and from phplayers itself in javascript version
+		$phplm_expand = $_COOKIE['phplm_expand'];
+		$default_expand = array_unique(array_merge($params['expanded'], explode('|', $_COOKIE['phplm_expand'])));
+	}
+	if ( isset($_GET['p']) && ereg('^[0-9\|]+$', $_GET['p']) ) {
+		// Get user choices from URLs generated by phplayers in php version
+		$phplm_expand = $_GET['p'];
+		$default_expand = array_unique(array_merge($params['expanded'], explode('|', $_GET['p'])));
+	}
 
+	if ( ! headers_sent() ) {
+		// Not using php's setcookie function because pipes '|' are converted to %7C
+		//   and are no more understood by PHP Layers javacript
+		header('Set-Cookie: phplm_expand='.$phplm_expand.'; path=/');
 	}
 
-	return $tikiphplayers->mkMenu($structure, '', $params['type'], '', 0, max($params['expanded']));
+	// Reset cookie that stores tree elements collapsed by the user, in order
+	//   to be sure every elements of $params['expanded'] are really expanded
+	//
+	setcookie('phplm_collapse', '', false, '/');
+
+	return $tikiphplayers->mkMenu($structure, '', $params['type'], '', 0, implode('|', $default_expand));
 }
 ?>

Modified: trunk/lib/tikilib.php
===================================================================
--- trunk/lib/tikilib.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/lib/tikilib.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -5317,7 +5317,7 @@
 		$attrib .= 'target="_blank" ';
 	if ($prefs['feature_wiki_ext_icon'] == 'y') {
 		$attrib .= 'class="wiki external" ';
-		$ext_icon = "<img border=\"0\" class=\"externallink\" src=\"img/icons/external_link.gif\" alt=\"external link\" />";
+		$ext_icon = "<img border=\"0\" class=\"externallink\" src=\"img/icons/external_link.gif\" alt=\" (external link)\" />";
 	} else {
 		$attrib .= 'class="wiki" ';
 		$ext_icon = "";
@@ -6083,8 +6083,10 @@
 		//   then also resize the image server-side, because it will generally imply less data to download from the user
 		//   (i.e. speed up the page download) and a better image quality (browser resize algorithms are quick but bad)
 		//
-		if ( $imgdata['width'] ) $imgdata['src'] .= '&amp;x='.$imgdata['width'];
-		if ( $imgdata['height'] ) $imgdata['src'] .= '&amp;y='.$imgdata['height'];
+		//   Note: ctype_digit is used to ensure there is only digits in width and height strings (e.g. to avoid '50%', ...)
+		//
+		if ( (int)$imgdata['width'] > 0 && ctype_digit($imgdata['width']) ) $imgdata['src'] .= '&amp;x='.$imgdata['width'];
+		if ( (int)$imgdata['height'] > 0 && ctype_digit($imgdata['height']) ) $imgdata['src'] .= '&amp;y='.$imgdata['height'];
 	}
 	if ( $imgdata['width'] ) $imgdata_dim .= ' width="' . $imgdata['width'] . '"';
 	if ( $imgdata['height'] ) $imgdata_dim .= ' height="' . $imgdata['height'] . '"';
@@ -6161,7 +6163,7 @@
 	    } else {
 			$class = 'class="wiki external"';
 	    	if ($prefs['feature_wiki_ext_icon'] == 'y') {
-		    	$ext_icon = "<img border=\"0\" class=\"externallink\" src=\"img/icons/external_link.gif\" alt=\"external link\" />";
+		    	$ext_icon = "<img border=\"0\" class=\"externallink\" src=\"img/icons/external_link.gif\" alt=\" (external link)\" />";
 	    	}
 		   	$rel='external';
 	    }

Modified: trunk/styles/darkroom.css
===================================================================
--- trunk/styles/darkroom.css	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/styles/darkroom.css	2008-07-28 14:58:28 UTC (rev 13915)
@@ -17,6 +17,8 @@
 	font-family: "Trebuchet MS", "Bitstream Vera Sans", sans-serif}
 
 html>body {font-size: 74% !important}
+*:first-child+html body {font-size: 72% !important;
+}
 body.fullscreen { }
 
 a,
@@ -39,7 +41,7 @@
 	padding: 0}
 
 h1 {
-	font-size: 1.8em;
+	font-size: 1.7em;
 	margin:0pt 10px 3px}
 
 h2 {font-size: 1.6em}
@@ -866,9 +868,14 @@
 .rbox-title {
 	text-align: left;
 	padding: 3px;
-	font-weight: bold}
+	font-weight: bold;
+	background: transparent;
+	border: 0}
 
-.rbox-data {padding: 3px}
+.rbox-data {
+	padding: 3px;
+	background: transparent;
+	border: 0}
 
 .rbox a {text-decoration: underline}
 
@@ -1339,11 +1346,13 @@
 	font-weight: bold}
 
 /* Quote plugin */
-div.quoteheader {margin-left: 20px}
+div.quoteheader {
+	margin-left: 20px;
+	margin-right: 10px}
 
 div.quotebody {
 	font-style: italic;
-	margin: 0 5px 10px 5px;
+	margin: 0 10px 10px 5px;
 	padding: 5px;
 	background: #696969;
 	color: #F5F5F5}
@@ -1580,11 +1589,15 @@
 	width: 100%}
 
 .post .postbody {
+	clear: both;
 	background: #343434;
-	width: 100%}
+	width: 100%;
+	min-width: 100%;
+	margin: 0;
+	border: 0}
 
 * html .post .postbody {font-size: 11px}
-*:first-child+html .postbody { width: 55em }
+*:first-child+html .post .postbody {min-width: 100% !important}
 	
 #col1 .post .postbody .content {
 	color: #D8D8D8;
@@ -1593,22 +1606,26 @@
 	float: left;
 	padding: 0 3px 3px 3px !important;
 	margin: 0 !important;
-	width: 100% !important;
+	width: 100%;
+	min-width: 100% !important;
 	height: 100%;
 	text-align: left;
-	color: #D8D8D8/*#3F3F3F*/}
+	color: #D8D8D8}
 	
 .post .postbody .content p { margin: 5px 10px }
 		
 .post .postbody-title {
+	background-color: inherit;
 	background: #343434 url(darkroom/button.png) repeat-x;
+	border-bottom: 0;
+	overflow: hidden;
 	color: #D8D8D8}
 
 .post .postbody-title .checkbox { float: left}
 
 .post .postbody-title .title {
 	float: left;
-	color: #29677B;
+	color: #D8D8D8;
 	font-weight: bold;
 	font-size: 1.1em;
 	margin-left: 5px;
@@ -1631,9 +1648,14 @@
 	border: none;
 	padding-left: 4px;
 	padding-bottom: 4px}
+	
+.post .author_info {
+	background-color: #575757;
+	border: 0}
 
 .post .author_info .icons { display: block}
 .post .author_info .icons .actions { margin-right: 10px}
+.post .author_post_info {background-color: #575757}
 .post .author_post_info_on { font-style: italic}
 
 .commentStyle_headers .author_info { float: left}
@@ -1641,13 +1663,16 @@
 .post .postbody-title .actions {
 	float: right;
 	font-size: .9em}
+	
+.postbody-content {min-width: 100%; margin: 5px}
+*:first-child+html .postbody-content {min-width: 73%}
 
 .post .postbody .attachments {
 	clear: both;
 	border-top: 1px dotted #D9D9D9;
 	margin-top: 5px}
 
-.post .postbody .attachments img { vertical-align: text-bottom}
+.post .postbody .attachments img {vertical-align: text-bottom}
 
 .post .postfooter .actions,
 .post .postfooter .status {
@@ -1655,18 +1680,18 @@
 	margin-left: 5px;
 	vertical-align: top}
 
-.post .postfooter .status { font-size: 10px}
+.post .postfooter .status {font-size: 10px}
 
 .post .postfooter {
 	float: right;
 	text-align: right}
 
-.post .inner > .postfooter { clear: both}
+.post .inner > .postfooter {clear: both}
 
 .post .contribution {
 	background-color: #F0F8FF;
 	border: 1px solid #D7E5F3;
-	padding: 0 2px 0 2px}
+	padding: 0 2px}
 
 .post .avatar {
 	float: right;
@@ -1711,7 +1736,7 @@
 .nb_replies {white-space: nowrap}
 
 .post_preview,
-.top_post { margin-bottom: 15px}
+.top_post {margin-bottom: 15px}
 /*.post .postbody .signature { float: left}*/
 
 /* Comments */
@@ -1740,7 +1765,9 @@
 	text-align: center;
 	font-weight: bold}
 	
-textarea#editpost2 {font-size: 1em}
+textarea#editpost2 {
+	width: 100%;
+	font-size: 1em}
 
 /***** Categories *****/
 

Modified: trunk/styles/feb12.css
===================================================================
--- trunk/styles/feb12.css	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/styles/feb12.css	2008-07-28 14:58:28 UTC (rev 13915)
@@ -1315,7 +1315,7 @@
 	font-weight: normal}
 	
 * html .post .postbody {font-size: 1em}
-*:first-child+html .postbody {width: 50em !important}
+*:first-child+html .postbody {min-width: 100% !important}
 
 .postbody-content {padding: 8px }
 
@@ -1464,7 +1464,8 @@
 
 .subcomment { margin-left: 10px}
 div.commentsedithelp { background: #ffcfcf; color: black; border: 1px solid #ff0000; text-align: center; font-weight: bold}
-textarea#editpost2 {font-size: .9em}
+textarea#editpost2 {font-size: 1em}
+
 /***** Categories *****/
 
 table.tcategpath {}

Modified: trunk/styles/tikinewt.css
===================================================================
--- trunk/styles/tikinewt.css	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/styles/tikinewt.css	2008-07-28 14:58:28 UTC (rev 13915)
@@ -145,8 +145,8 @@
 	cursor: pointer;
 }
 
-.findtable input {
-	_font-size: 1em;
+* html .findtable input {
+	font-size: 1em;
 }
 
 fieldset {
@@ -362,8 +362,7 @@
 #c1c2 #wrapper #col1 #tiki-center {
 	background: #F3F6F9;
 	margin: 0;
-	padding-left: 5px;
-	padding-bottom: 0;
+	padding: 0 5px;
 	border-left: 1px solid #8CACBB;
 /*	font-size: .9em;*/
 }
@@ -1795,6 +1794,7 @@
 	color: black;
 }
 /* forums new */
+
 .post .postbody {
 	clear: both;
 	border: solid 1px #E7EAED;
@@ -1802,12 +1802,11 @@
 	margin: 0;
 	margin-top: 5px;
 	padding: 0;
-	background-color: #F9FCFF;
-	/*font-size: 1.1em;*/
+	background-color: #F9FCFF
 }
 
 * html .post .postbody {font-size: 11px}
-*:first-child+html .post .postbody {width: 67em !important}
+*:first-child+html .post .postbody {min-width: 100% !important}
 
 .postbody-title {
 	display: block;
@@ -1830,10 +1829,10 @@
 #col1 .post .postbody .content {
 	color: #000000;
 	background: #E7E9EA !important;
-	height: 100%;/*
-	padding: 0 3px 3px;*/
+	height: 100%;
+	padding: 0;
 	text-align: left;
-	width: 100%}
+	width: 100% !important}
 
 .post .author {	
 	float: left;
@@ -1871,7 +1870,10 @@
 	float: right;
 	width: 73%;
 	min-height: 4em;
-	margin: 2px}
+	margin: 2px;
+}
+	
+*:first-child+html .postbody-content {min-width: 73%}
 
 /*.postbody .content .quoteheader {}
 .postbody .content .quotebody {display: block}*/
@@ -1972,7 +1974,7 @@
 	font-weight: bold;
 }
 
-textarea#editpost2 {font-size: .97em}
+textarea#editpost2 {font-size: 1.1em}
 
 /***** Categories *****/
 
@@ -2660,7 +2662,7 @@
 #shadowbox_title {
 	height: auto !important;
 	padding: 0;
-	overflow: display}
+	overflow: visible;}
 
 #shadowbox_title_inner{
 	height: auto !important;

Modified: trunk/styles/transitions/1.9to2.0.css
===================================================================
--- trunk/styles/transitions/1.9to2.0.css	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/styles/transitions/1.9to2.0.css	2008-07-28 14:58:28 UTC (rev 13915)
@@ -1,8 +1,8 @@
 /*
 $Header: /cvsroot/tikiwiki/tiki/styles/transitions/1.9to1.10.css,v 1.15.2.4 2008-03-16 01:02:39 nyloth Exp $
 
-The following CSS classes were added to Tiki between v1.9 and v1.10
-They should be added to themes (possibly with tweaks) to make the theme v1.10 ready
+The following CSS classes were added to Tiki between v1.9 and v2.0
+They should be added to themes (possibly with tweaks) to make the theme v2.0 ready
 */
 /* editable wiki section */
 div.split {

Modified: trunk/templates/comments.tpl
===================================================================
--- trunk/templates/comments.tpl	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/templates/comments.tpl	2008-07-28 14:58:28 UTC (rev 13915)
@@ -205,7 +205,7 @@
 	{$msgError}</div><br />{/if}
 
 	{if $comment_preview eq 'y'}
-	<div class="post_preview">
+	<div class="clearfix post_preview">
 		{if $forum_mode neq 'y'}<b>{tr}Preview{/tr}</b>{/if}
 		<div class="post"><div class="inner"><span class="corners-top"><span></span></span><div class="postbody">
 			<div class="postbody-title"><div class="title">{$comments_preview_title}</div></div>
@@ -217,6 +217,7 @@
 	  		</div>
 		</div><span class="corners-bottom"><span></span></span></div></div>
 	</div>
+{*	<br class="clear" />*}
 	{/if}
 
 	<form enctype="multipart/form-data" method="post" action="{$comments_father}" id='editpostform'>

Modified: trunk/templates/tiki-admin-include-look.tpl
===================================================================
--- trunk/templates/tiki-admin-include-look.tpl	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/templates/tiki-admin-include-look.tpl	2008-07-28 14:58:28 UTC (rev 13915)
@@ -84,7 +84,7 @@
 	</tr>
 	<tr>
         <td class="form" > {if $prefs.feature_help eq 'y'}<a href="{$prefs.helpurl}Site+Identity" target="tikihelp" class="tikihelp" title="{tr}Site Identity{/tr}">{/if} {tr}Site Identity{/tr} {if $prefs.feature_help eq 'y'}</a>{/if}</td>
-		<td ><input type="checkbox" name="feature_siteidentity" {if $prefs.feature_siteidentity eq 'y'}checked="checked"{/if}/> {tr}Required for all the following features{/tr}</td>
+		<td ><input type="checkbox" name="feature_siteidentity" {if $prefs.feature_siteidentity eq 'y'}checked="checked"{/if}/> {tr}Required for many of the general layout features{/tr}</td>
 	</tr>
        </table>
        {if $prefs.feature_tabs neq 'y'}</div>{/if}

Modified: trunk/tiki-install.php
===================================================================
--- trunk/tiki-install.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/tiki-install.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -28,14 +28,6 @@
 	return $default;
 }
 
-function user_is_admin( $dbTiki, $name )
-{
-	$result = $dbTiki->query( "SELECT COUNT(*) FROM users_users u INNER JOIN users_usergroups g ON u.userId = g.userId WHERE login = ?", array( $name ) );
-
-	$count = reset( $result->fetchRow() );
-	return $count > 0;
-}
-
 function installer_is_accessible()
 {
 	global $cookie_name, $dbTiki, $db_tiki, $host_tiki, $user_tiki, $pass_tiki, $dbs_tiki;
@@ -49,8 +41,11 @@
 		return true;
 	
 	$session_type = get_pref( $dbTiki, 'session_db', 'n' );
-	$cookie_name = 'tiki-user-' . get_pref( $dbTiki, 'cookie_name', 'tikiwiki' );
+	$cookie_name = get_pref( $dbTiki, 'cookie_name', 'tikiwiki' );
 
+	// Clean cookie name, the same way it's done in tiki-setup_base.php
+	$cookie_name = 'tiki-user-'.ereg_replace("[^a-zA-Z0-9]", "", $cookie_name);
+
 	if ($session_type == 'y') {
 		include('db/local.php');
 		$ADODB_SESSION_DRIVER=$db_tiki;
@@ -72,7 +67,7 @@
 	if( ! isset( $_SESSION[$cookie_name] ) )
 		return false;
 	
-	if( user_is_admin( $dbTiki, $_SESSION[$cookie_name] ) )
+	if( $_SESSION[$cookie_name] == 'admin' )
 		return true;
 
 	global $db_tiki;

Modified: trunk/tiki-setup.php
===================================================================
--- trunk/tiki-setup.php	2008-07-28 14:43:34 UTC (rev 13914)
+++ trunk/tiki-setup.php	2008-07-28 14:58:28 UTC (rev 13915)
@@ -12,6 +12,12 @@
   exit;
 }
 
+// Enable Versioning
+// Please update the specified class below at release time, as well as
+// adding new release to http://tikiwiki.org/{$branch}.version file
+include_once ('lib/setup/twversion.class.php');
+$TWV = new TWVersion();
+
 /* Automatically set params used for absolute URLs - BEGIN */
 
 $tiki_setup_dir = realpath(dirname(__FILE__));
@@ -161,13 +167,7 @@
 $smarty->assign('show_stay_in_ssl_mode', $show_stay_in_ssl_mode);
 $smarty->assign('stay_in_ssl_mode', $stay_in_ssl_mode);
 
-// Enable Versioning
-// Please update the specified class below at release time, as well as
-// adding new release to http://tikiwiki.org/{$branch}.version file
-include_once ('lib/setup/twversion.class.php');
-$TWV = new TWVersion();
 $smarty->assign('tiki_version', $TWV->version);
 $smarty->assign('tiki_branch', $TWV->branch);
 $smarty->assign('tiki_star', $TWV->star);
 $smarty->assign('tiki_uses_cvs', $TWV->cvs);
-


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




Thread: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13915] trunk (Page 2)

The Free / Libre / Open Source Web App with the most built-in features

tikiwiki-cvs