Merge branch 'master' of git.sv.gnu.org:/srv/git/oddmuse

kensanata · Jul 14, 2015 · 2c82301 · 2c82301
2 parents e8b7ad4 + f0588fa
commit 2c82301
Show file tree

Hide file tree

Showing 44 changed files with 238 additions and 420 deletions.
diff --git a/modules/div-foo.pl b/modules/div-foo.pl
@@ -18,11 +18,15 @@
 
 our (@MyRules);
 our ($DivFooPrefix);
+our (%RuleOrder);
 
 $DivFooPrefix = 'foo_';
 
 push(@MyRules, \&DivFooRule);
 
+# conflicts with <nowiki> and other such rules by usemod.pl
+$RuleOrder{\&DivFooRule} = 200;
+
 sub DivFooRule {
   if (m/\G \&lt; ([a-z_-][a-z0-9 _-]+[a-z0-9_-]) \&gt; \s*\n /cgx) {
     return CloseHtmlEnvironment('p') . AddHtmlEnvironment('div', 'class="' . join(' ', map {"$DivFooPrefix$_"} split /\s+/, $1) . '"');

diff --git a/modules/edit-cluster.pl b/modules/edit-cluster.pl
@@ -49,7 +49,7 @@ sub GetRc {
     }
   }
   $wanted_clusters{$clusterOnly} = $clusterOnly;
-  @outrc = reverse @outrc if GetParam('newtop', $RecentTop);
+  @outrc = reverse @outrc;
   my @filters;
   @filters = SearchTitleAndBody($filterOnly) if $filterOnly;
   foreach my $rcline (@outrc) {

diff --git a/modules/google-plus-one.pl b/modules/google-plus-one.pl
@@ -16,8 +16,6 @@
 # use warnings;
 use v5.10;
 
-package OddMuse;
-
 AddModuleDescription('google-plus-one.pl', 'Google Plus One Module');
 
 our ($q, @MyAdminCode, %Action);

diff --git a/modules/image.pl b/modules/image.pl
@@ -118,6 +118,7 @@ sub ImageGetExternalUrl {
     } elsif ($UsePathInfo and !$Monolithic) {
       $link = $ScriptName . '/' . $link;
     } elsif ($Monolithic) {
+      # if used together with all.pl
       $link = '#' . $link;
     } else {
       $link = $ScriptName . '?' . $link;

diff --git a/modules/like.pl b/modules/like.pl
@@ -18,8 +18,6 @@
 # use warnings;
 use v5.10;
 
-package OddMuse;
-
 AddModuleDescription('like.pl', 'Like Button');
 
 our $LikeRegexp =      T('====(\d+) persons? liked this===='); # must match all translations

diff --git a/modules/plainclusterrc.pl b/modules/plainclusterrc.pl
diff --git a/modules/slideshow.pl b/modules/slideshow.pl