From b101a8f6fb3fd3ec0d5466ba1bb7bc9dc9480fba Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 24 Feb 2016 11:20:46 -0800
Subject: missing function

---
 Zotlabs/Web/Router.php |  1 -
 include/items.php      |  2 +-
 include/session.php    | 23 +++++++++++++++++++----
 index.php              | 20 +++-----------------
 mod/webpages.php       |  2 ++
 version.inc            |  2 +-
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php
index 4ae96b5da..af171437d 100644
--- a/Zotlabs/Web/Router.php
+++ b/Zotlabs/Web/Router.php
@@ -196,5 +196,4 @@ class Router {
 			}
 		}
 	}
-
 }
\ No newline at end of file
diff --git a/include/items.php b/include/items.php
index 1b8824793..bb4d1108e 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4132,7 +4132,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 		$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($item['plink']) . '" />' . "\r\n";
 	}
 
-	if(activity_compare($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_compare($item['verb'],ACTIVITY_POST)) {
+	if(activity_match($item['obj_type'],ACTIVITY_OBJ_EVENT) && activity_match($item['verb'],ACTIVITY_POST)) {
 		$obj = ((is_array($item['obj'])) ? $item['object'] : json_decode($item['object'],true));
  
 		$o .= '<title>' . xmlify($item['title']) . '</title>' . "\r\n";
diff --git a/include/session.php b/include/session.php
index 92004bc18..182805980 100644
--- a/include/session.php
+++ b/include/session.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @file include/session.php
  *
@@ -14,8 +15,8 @@ $session_expire = 180000;
 function new_cookie($time) {
 	$old_sid = session_id();
 
-// ??? This shouldn't have any effect if called after session_start()
-// We probably need to set the session expiration and change the PHPSESSID cookie.
+	// ??? This shouldn't have any effect if called after session_start()
+	// We probably need to set the session expiration and change the PHPSESSID cookie.
 
 	session_set_cookie_params($time);
 	session_regenerate_id(false);
@@ -108,8 +109,9 @@ ini_set('session.use_only_cookies', 1);
 ini_set('session.cookie_httponly', 1);
 
 /*
- * PHP function which sets our user-level session storage functions.
+ * Set our session storage functions.
  */
+
 session_set_save_handler(
 		'ref_session_open',
 		'ref_session_close',
@@ -117,4 +119,17 @@ session_set_save_handler(
 		'ref_session_write',
 		'ref_session_destroy',
 		'ref_session_gc'
-);
\ No newline at end of file
+);
+
+
+   // Force cookies to be secure (https only) if this site is SSL enabled. Must be done before session_start().
+
+    if(intval($a->config['system']['ssl_cookie_protection'])) {
+        $arr = session_get_cookie_params();
+        session_set_cookie_params(
+            ((isset($arr['lifetime']))  ? $arr['lifetime'] : 0),
+            ((isset($arr['path']))      ? $arr['path']     : '/'),
+            ((isset($arr['domain']))    ? $arr['domain']   : $a->get_hostname()),
+            ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+            ((isset($arr['httponly']))  ? $arr['httponly'] : true));
+    }
\ No newline at end of file
diff --git a/index.php b/index.php
index 4ae2ebe36..bccb270d8 100755
--- a/index.php
+++ b/index.php
@@ -61,25 +61,11 @@ if(! $a->install) {
 	load_hooks();
 	call_hooks('init_1');
 
-	$a->language = get_best_language();
-	load_translation_table($a->language);
-	// Force the cookie to be secure (https only) if this site is SSL enabled. Must be done before session_start().
-
-	if(intval($a->config['system']['ssl_cookie_protection'])) {
-		$arr = session_get_cookie_params();
-		session_set_cookie_params(
-			((isset($arr['lifetime']))  ? $arr['lifetime'] : 0),
-			((isset($arr['path']))      ? $arr['path']     : '/'),
-			((isset($arr['domain']))    ? $arr['domain']   : $a->get_hostname()),
-			((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
-			((isset($arr['httponly']))  ? $arr['httponly'] : true));
-	}
 }
-else {
-	// load translations but do not check plugins as we have no database
+
+
 	$a->language = get_best_language();
-	load_translation_table($a->language,true);
-}
+	load_translation_table($a->language,$a->install);
 
 
 /**
diff --git a/mod/webpages.php b/mod/webpages.php
index 8e12b5910..6b157073e 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -128,6 +128,8 @@ function webpages_content(&$a) {
 
 	// Get a list of webpages.  We can't display all them because endless scroll makes that unusable, 
 	// so just list titles and an edit link.
+
+
 	/** @TODO - this should be replaced with pagelist_widget */
 
 	$sql_extra = item_permissions_sql($owner);
diff --git a/version.inc b/version.inc
index b794d33a4..2d59eb514 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-23.1316H
+2016-02-24.1317H
-- 
cgit v1.2.3