Merge pull request #74 from beardy-unixer/master

Couple of bugs

3 files changed, 5 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 8e6852f7a..94affb786 100755
--- a/boot.php
+++ b/boot.php
@@ -2058,13 +2058,14 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 			'title' => t('Events and Calendar'),
 			'id'    => 'events-tab',
 		);
+		if(feature_enabled(local_user(),'webpages')){
 		$tabs[] = array(
 			'label' => t('Wepages'),
 			'url'	=> $a->get_baseurl() . '/webpages/' . $nickname,
 			'sel' 	=> ((argv(0) == 'webpages') ? 'active' : ''),
 			'title' => t('Manage Webpages'),
 			'id'    => 'webpages-tab',
-		);
+		);}
 	}
 	else {
 		// FIXME
diff --git a/mod/webpages.php b/mod/webpages.php
index 3a3e30309..1e9efa544 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -65,7 +65,8 @@ $r = q("select * from item_id where uid = %d and service = 'WEBPAGE'",
 
 // This isn't pretty, but it works.  Until I figure out what to do with the UI, it's Good Enough(TM).
        return $o . replace_macros(get_markup_template("webpagelist.tpl"), array(
-           	    '$pages' => $pages
+		    '$editlink' => t('Edit'),
+           	    '$pages' => $pages,
         ));
     
 
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index 8ae9a1da8..c05e2ebee 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -3,7 +3,7 @@
 {{foreach $pages as $key => $items}} 
 <ul class="page-list">
 {{foreach $items as $item}}
-<li><a href="editwebpage/{{$item.url}}">Edit</a> {{$item.title}}</li>
+<li><a href="editwebpage/{{$item.url}}">{{$editlink}}</a> {{$item.title}}</li>
 {{/foreach}}
 </ul>
 <div class="clear"></div>