refs #514 : merge with 2.0 tree.

Needlworks · Feb 25, 2011 · b1d2504 · b1d2504
2 parents 46e0891 + 2eed058
commit b1d2504
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/library/preprocessor.php b/library/preprocessor.php
@@ -209,7 +209,7 @@
 	Determine the resource URLs and paths.
 */
 	if(is_null($context->getProperty('service.jqueryURL'))) {
-		$context->setProperty('service.jqueryURL',$context->getProperty('service.path')."/resources/script/jquery/";
+		$context->setProperty('service.jqueryURL',$context->getProperty('service.path')."/resources/script/jquery/");
 	}
 /** Administration panel skin / editor template
     -------------------------------------------

diff --git a/resources/setup/initialize.Cubrid.sql b/resources/setup/initialize.Cubrid.sql
@@ -323,6 +323,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float default 0 NOT NULL,
   created integer default 0 NOT NULL,
   updated integer default 0 NOT NULL,
+  expires integer default 0 NOT NULL,
   PRIMARY KEY  (id,address)
 ) [##_charset_##];
 CREATE INDEX [##_dbPrefix_##]Sessions_updated_idx ON [##_dbPrefix_##]Sessions (updated);

diff --git a/resources/setup/initialize.MySQL.sql b/resources/setup/initialize.MySQL.sql
@@ -333,6 +333,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float NOT NULL default '0',
   created int(11) NOT NULL default '0',
   updated int(11) NOT NULL default '0',
+  expires int(11) NOT NULL default '0',
   PRIMARY KEY  (id,address),
   KEY updated (updated)
 ) [##_charset_##];

diff --git a/resources/setup/initialize.PostgreSQL.sql b/resources/setup/initialize.PostgreSQL.sql
@@ -331,6 +331,7 @@ CREATE TABLE [##_dbPrefix_##]Sessions (
   timer float NOT NULL default 0,
   created integer NOT NULL default 0,
   updated integer NOT NULL default 0,
+  expires integer NOT NULL default 0,
   PRIMARY KEY  (id,address)
 ) [##_charset_##];
 CREATE INDEX [##_dbPrefix_##]Sessions_updated_idx ON [##_dbPrefix_##]Sessions (updated);

diff --git a/rewrite.php b/rewrite.php
@@ -2,12 +2,11 @@
 /// Copyright (c) 2004-2011, Needlworks  / Tatter Network Foundation
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT)
-
 define('ROOT', '.');
 require_once(ROOT.'/framework/Dispatcher.php');
 /** Dispatching Interface request via URI */
 $dispatcher = Dispatcher::getInstance();
 /** Interface Loading */
 if (empty($service['debugmode'])) {	@include_once $dispatcher->interfacePath;}
 else {include_once $dispatcher->interfacePath;}
-?>
+?>