From 73ed4ae8513af1cc6e795b125cc1f319a965bfb4 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 12 Mar 2010 17:03:51 +0000
Subject: Merged Cash's bugfixes from the 1.7 branch (3288:5377).

git-svn-id: http://code.elgg.org/elgg/trunk@5378 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/pages/views/default/forms/pages/edit.php | 14 ++++++++++++++
 mod/pages/views/default/pages/welcome.php    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'mod/pages/views/default')

diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php
index 2b57fe814..2ad454073 100644
--- a/mod/pages/views/default/forms/pages/edit.php
+++ b/mod/pages/views/default/forms/pages/edit.php
@@ -25,6 +25,20 @@
 			$vars['entity']->access_id = 0;
 			$vars['entity']->write_access_id = 0;
 		}
+
+		// pull in sticky values from session
+		if (isset($_SESSION['page_description'])) {
+			$vars['entity']->description = $_SESSION['page_description'];
+			$vars['entity']->tags = $_SESSION['page_tags'];
+			$vars['entity']->access_id = $_SESSION['page_read_access'];
+			$vars['entity']->write_access_id = $_SESSION['page_write_access'];
+
+			// clear them
+			unset($_SESSION['page_description']);
+			unset($_SESSION['page_tags']);
+			unset($_SESSION['page_read_access']);
+			unset($_SESSION['page_write_access']);
+		}
 	}
 ?>
 <div class="contentWrapper">
diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php
index deefdba30..e4a465fdd 100644
--- a/mod/pages/views/default/pages/welcome.php
+++ b/mod/pages/views/default/pages/welcome.php
@@ -22,7 +22,7 @@
 
 ?>
 
-<div class="contentWrapper pageswelcome"><p><?php elgg_echo('pages:welcomemessage'); ?></p></div>
+<div class="contentWrapper pageswelcome"><p><?php echo sprintf(elgg_echo('pages:welcomemessage'), $vars['config']->sitename); ?></p></div>
     
 <?php
     }
-- 
cgit v1.2.3