Merge branch 'master' of git@github.com:marcusramberg/mojomojo

mojomojo · Nov 11, 2008 · b7203da · b7203da
2 parents 8753c70 + 00cfc5c
commit b7203da
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/lib/MojoMojo.pm b/lib/MojoMojo.pm
@@ -430,15 +430,17 @@ sub check_permissions {
     my %perms = map { $_ => $rulescomparison{$_}{'allowed'} } keys %rulescomparison;
     return \%perms;
 }
+
 unless (-e MojoMojo->config->{index_dir}) {
-    mkdir(MojoMojo->config->{index_dir}) || die "Could not make index directory:".MojoMojo->config->{index_dir};
+    mkdir(MojoMojo->config->{index_dir}) || die 'Could not make index directory <'.MojoMojo->config->{index_dir}.'>';
 }
-die "Require write access to index:".MojoMojo->config->{index_dir} unless (-w MojoMojo->config->{index_dir});
+die 'Require write access to index <'.MojoMojo->config->{index_dir}.'>' unless (-w MojoMojo->config->{index_dir});
+
 MojoMojo->model('Search')->prepare_search_index() unless (-f MojoMojo->config->{index_dir}.'/segments'); 
 unless (-e MojoMojo->config->{attachment_dir}) {
-    mkdir(MojoMojo->config->{attachment_dir}) || die "Could not make attachment directory:".MojoMojo->config->{attachment_dir};
+    mkdir(MojoMojo->config->{attachment_dir}) || die 'Could not make attachment directory <'.MojoMojo->config->{attachment_dir}.'>';
 }
-die "Require write access to attachment_dir:".MojoMojo->config->{attachment_dir} unless (-w MojoMojo->config->{attachment_dir});
+die 'Require write access to attachment_dir: <'.MojoMojo->config->{attachment_dir}.'>' unless (-w MojoMojo->config->{attachment_dir});
 
 1;
 

diff --git a/lib/MojoMojo/Controller/Tag.pm b/lib/MojoMojo/Controller/Tag.pm
@@ -6,7 +6,7 @@ use HTML::TagCloud;
 
 =head1 NAME
 
-MojoMojo::Controller::Attachment - Attachment controller
+MojoMojo::Controller::Tag - Tags controller
 
 =head1 SYNOPSIS
 

diff --git a/lib/MojoMojo/Schema.pm b/lib/MojoMojo/Schema.pm
@@ -87,10 +87,10 @@ Check out our [[Help]] section.', 'released', 1, 1, '', '', '', ''
             [
                 2, 1, $people[1]->id, 0, 'h1. Help Index.
 
- * Editing Pages
- * Formatter Syntax.
- * Using Tags
- * Attachments & Photos', 'released', 1, 1, '', '', '', ''
+h2. Editing Pages
+h2. Formatter Syntax.
+h2. Using Tags
+h2. Attachments & Photos', 'released', 1, 1, '', '', '', ''
             ],
             [
                 3, 1, $people[1]->id, 0, 'h1. Admin User.

diff --git a/root/base/edithelp.tt b/root/base/edithelp.tt
@@ -1,6 +1,6 @@
 [%IF !c.pref('main_formatter') || c.pref('main_formatter') == 'MojoMojo::Formatter::Textile'%]
 <div id="TextileHelp">
-		<h2>Textile formatting tips (<a href="http://www.bradchoate.com/mt/docs/mtmanual_textile2.html" target=>"_top">advanced</a>)</h2>
+		<h2>Textile formatting tips (<a href="http://www.bradchoate.com/mt/docs/mtmanual_textile2.html" target="_top">advanced</a>)</h2>
 <div class="rightHandSide"> 
     <h3>Wiki words</h3>
 <p>