diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
| commit | be37104ac63cd25f2eac831ca03d6d2b19976e1c (patch) | |
| tree | 5b168134f2b07933831daedd8cf2641ffb6c5c7d /mod/pages | |
| parent | d45a24be28b2eb2d0c2731708b589788a5b87215 (diff) | |
| download | elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.gz elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.bz2 | |
Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged due to standardization of code in trunk but not branch)
git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/pages')
| -rw-r--r-- | mod/pages/actions/pages/edit.php | 4 | ||||
| -rw-r--r-- | mod/pages/start.php | 7 | ||||
| -rw-r--r-- | mod/pages/views/default/forms/pages/edit.php | 8 |
3 files changed, 5 insertions, 14 deletions
diff --git a/mod/pages/actions/pages/edit.php b/mod/pages/actions/pages/edit.php index 004b81a25..b583563f9 100644 --- a/mod/pages/actions/pages/edit.php +++ b/mod/pages/actions/pages/edit.php @@ -64,9 +64,7 @@ if ($page instanceof ElggObject) { // Save fields - note we always save latest description as both description and annotation if (sizeof($input) > 0) { foreach($input as $shortname => $value) { - if ((!$pages_guid) || (($pages_guid) && ($shortname != 'title'))) { - $page->$shortname = $value; - } + $page->$shortname = $value; } } diff --git a/mod/pages/start.php b/mod/pages/start.php index 8f4e3b5e2..6fd0ef26d 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -70,9 +70,8 @@ function pages_init() { function pages_url($entity) { global $CONFIG; - - return $CONFIG->url . "pg/pages/view/{$entity->guid}/"; - + $title = elgg_get_friendly_title($entity->title); + return $CONFIG->url . "pg/pages/view/{$entity->guid}/$title"; } /** @@ -207,7 +206,7 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); } - if ($method == 'web') { + if ($method == 'site') { $owner = $entity->getOwnerEntity(); return $owner->name . ' ' . elgg_echo("pages:via") . ': ' . $title . "\n\n" . $descr . "\n\n" . $entity->getURL(); } diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 2095e4fd8..bdd721b82 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -45,11 +45,6 @@ if (!$vars['entity']) { echo elgg_view('input/securitytoken'); if (is_array($vars['config']->pages) && sizeof($vars['config']->pages) > 0) { foreach($vars['config']->pages as $shortname => $valtype) { - $disabled = ""; - - if (!$new_page && ($shortname == 'title')) { - $disabled = true; - } ?> <p> @@ -57,8 +52,7 @@ if (is_array($vars['config']->pages) && sizeof($vars['config']->pages) > 0) { <?php echo elgg_echo("pages:{$shortname}") ?><br /> <?php echo elgg_view("input/{$valtype}",array( 'internalname' => $shortname, - 'value' => $vars['entity']->$shortname, - 'disabled' => $disabled + 'value' => $vars['entity']->$shortname )); ?> </label> </p> |