diff options
author | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-30 22:23:45 +0000 |
---|---|---|
committer | ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-10-30 22:23:45 +0000 |
commit | bb1f45eb02bac603d67ac08cb674c4050a245c28 (patch) | |
tree | 239c6afba40d3160be53c22984e3b7ba1b7442ec /mod/blog | |
parent | b5c5261077640d2390f4e3c44cc51bfe4bed2e4c (diff) | |
download | elgg-bb1f45eb02bac603d67ac08cb674c4050a245c28.tar.gz elgg-bb1f45eb02bac603d67ac08cb674c4050a245c28.tar.bz2 |
Refs #2598: Converted most $vars['url'] to elgg_get_site_url()
git-svn-id: http://code.elgg.org/elgg/trunk@7149 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/blog')
-rw-r--r-- | mod/blog/views/default/blog/forms/edit.php | 8 | ||||
-rw-r--r-- | mod/blog/views/default/blog/sidebar_edit.php | 2 | ||||
-rw-r--r-- | mod/blog/views/default/blog/sidebar_revisions.php | 2 | ||||
-rw-r--r-- | mod/blog/views/default/object/blog.php | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php index 3e7e29dee..88d41d269 100644 --- a/mod/blog/views/default/blog/forms/edit.php +++ b/mod/blog/views/default/blog/forms/edit.php @@ -64,7 +64,7 @@ if (isset ($vars['entity'])) { } // add a delete button if editing - $delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}"; + $delete_url = elgg_get_site_url()."action/blog/delete?guid={$blog->getGUID()}"; $delete_link = elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), @@ -219,7 +219,7 @@ ___END; echo elgg_view('input/form', array( 'internalid' => 'blog_post_edit', 'internalname' => 'blog_post', - 'action' => "{$vars['url']}action/blog/save", + 'action' => elgg_get_site_url()."action/blog/save", 'body' => $form_body )); @@ -265,7 +265,7 @@ elgg_clear_sticky_form('blog'); return false; } - var draftURL = "<?php echo $vars['url']; ?>action/blog/auto_save_revision"; + var draftURL = "<?php echo elgg_get_site_url(); ?>action/blog/auto_save_revision"; var postData = form.serializeArray(); // force draft status @@ -282,7 +282,7 @@ elgg_clear_sticky_form('blog'); // get a copy of the body to compare for auto save oldDescription = $('form[name=blog_post]').find('textarea[name=description]').val(); -/* we don't seems to be using the text counter anymoreÉ +/* we don't seems to be using the text counter anymore� $('#excerpt.excerpt').each(function(){ var allowed = 200; diff --git a/mod/blog/views/default/blog/sidebar_edit.php b/mod/blog/views/default/blog/sidebar_edit.php index 1efa17c23..3b884437f 100644 --- a/mod/blog/views/default/blog/sidebar_edit.php +++ b/mod/blog/views/default/blog/sidebar_edit.php @@ -27,7 +27,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { if ($revisions) { echo '<ul class="blog_revisions">'; - $load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; + $load_base_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; foreach ($revisions as $revision) { $time = elgg_view_friendly_time($revision->time_created); diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php index b2323e7b3..43215963b 100644 --- a/mod/blog/views/default/blog/sidebar_revisions.php +++ b/mod/blog/views/default/blog/sidebar_revisions.php @@ -31,7 +31,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) { $n = count($revisions); echo '<ul class="blog_revisions">'; - $load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; + $load_base_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; // show the "published revision" if ($blog->status == 'published') { diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php index bf85ea407..fc88eea25 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -20,7 +20,7 @@ $excerpt = $blog->excerpt; $body = autop($blog->description); $owner_icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny')); -$owner_blog_link = "<a href=\"{$vars['url']}pg/blog/$owner->username\">{$owner->name}</a>"; +$owner_blog_link = "<a href=\"".elgg_get_site_url()."pg/blog/$owner->username\">{$owner->name}</a>"; $author_text = sprintf(elgg_echo('blog:author_by_line'), $owner_blog_link); if($blog->tags){ $tags = "<p class=\"tags\">" . elgg_view('output/tags', array('tags' => $blog->tags)) . "</p>"; @@ -48,10 +48,10 @@ if ($blog->comments_on != 'Off') { $edit = elgg_view('output/access', array('entity' => $vars['entity'])); if ($blog->canEdit()) { - $edit_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; + $edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/"; $edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>'; - $delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}"; + $delete_url = elgg_get_site_url()."action/blog/delete?guid={$blog->getGUID()}"; $delete_link = "<span class='delete_button'>" . elgg_view('output/confirmlink', array( 'href' => $delete_url, 'text' => elgg_echo('delete'), |