Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 5 insertions, 2 deletions

diff --git a/mod/page.php b/mod/page.php
index eedfd472c..2d977fb7a 100644
--- a/mod/page.php
+++ b/mod/page.php
@@ -35,7 +35,11 @@ function page_init(&$a) {
 	}
 
 	$channel_address = argv(1);
-	$page_id = argv(2);
+
+	// The page link title was stored in a urlencoded format
+	// php or the browser may/will have decoded it, so re-encode it for our search
+
+	$page_id = urlencode(argv(2));
 
 	$u = q("select channel_id from channel where channel_address = '%s' limit 1",
 		dbesc($channel_address)
@@ -62,7 +66,6 @@ function page_init(&$a) {
 		intval(ITEM_TYPE_WEBPAGE),
 		intval(ITEM_PDL)
 	);
-
 	if(! $r) {
 
 		// Check again with no permissions clause to see if it is a permissions issue