aboutsummaryrefslogtreecommitdiff
path: root/mod/pages/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 17:03:51 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 17:03:51 +0000
commit73ed4ae8513af1cc6e795b125cc1f319a965bfb4 (patch)
tree86681c6baee8869faab58940588251be692dd9e4 /mod/pages/views
parentc41553d5e532ca86070d511d50d150d97869bb84 (diff)
downloadelgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.gz
elgg-73ed4ae8513af1cc6e795b125cc1f319a965bfb4.tar.bz2
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
Diffstat (limited to 'mod/pages/views')
-rw-r--r--mod/pages/views/default/forms/pages/edit.php14
-rw-r--r--mod/pages/views/default/pages/welcome.php2
2 files changed, 15 insertions, 1 deletions
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
}