Dandello wrote on Sep 5^th, 2014 at 4:44am:


I'm old school guy who can handle three-way merges... So I don't need "fixed" version

Oh, don't worry about needing things to do in 2.6.3.  There's always something to do.

Traditionally YaBB has locked down versions and offered zipped up packages - mostly (I think) so modders would have a 'fixed' version to work from. That's hard to do when it keeps changing - and work on 2.6.2 starts as soon as I've finished testing the current mods and handled some mod requests.

Dandello wrote on Sep 4^th, 2014 at 11:08pm:


I didn't say anything about freezing trunk... I said I shouldn't drink so much coffee... Anyways... 2.6.1 is what 2.6.0 was supposed to be... the perfect build with minimal number of glitches and bugs...

It really doesn't matter if we ever get the trunk frozen as it is not meant to be frozen, that is what for version control systems have branches and tags. All we should care about is fixing more bugs and glitches. Not forgetting we should start planning what we're gonna do with 2.6.3... We can't put all postponed changes in 2.6.2, because it would leave us nothing to work on.

Dandello wrote on Sep 4^th, 2014 at 11:08pm:


The problem is that Perl doesn't treat them equally with numeric literals without them... Perl treats them halfway between numeric literals and string literals... As such in some cases you have to actually explicitly strip them for code to work.

Monni wrote on Sep 4^th, 2014 at 10:15pm:

Damian Conway recommends it in his writings (he wrote 'Perl Best Practices') as an aid to readability.

This fix will go into the 2.6 branch for 2.6.2. I have some mod hooks and tweaks that will be going in as well. (If we don't freeze the trunk except for mission critical bug fixes, we'll never get it locked down.  )

Too much coffee

 Index: cgi-bin/yabb2/Sources/Subs.pm
 ===================================================================
 --- cgi-bin/yabb2/Sources/Subs.pm	(revision 1564)
 +++ cgi-bin/yabb2/Sources/Subs.pm	(working copy)
 @@ -887,7 +887,7 @@
      LoadLanguage('Error');
      get_template('Other');

 -    my $errormessage = "$error_txt{$x[0]} $x[1]";
 +    my $errormessage = $x[0] ? ( $error_txt{$x[0]} . ( $x[1] ? " $x[1]" : q{} ) ) : isempty( $x[1], q{} );

      my ( $filename, $line, $subroutine ) = get_caller();
      if (   ( $debug == 1 || ( $debug == 2 && $iamadmin ) )
 @@ -1102,13 +1102,13 @@
              {
                  $avatar_limit ||= 0;
                  $CGI:OST_MAX = int( 1024 * $avatar_limit );
 -                if ($CGI:OST_MAX) { $CGI:OST_MAX += 1_000_000; }    # *
 +                if ($CGI:OST_MAX) { $CGI:OST_MAX += 1048576; }    # *
              }
              else {

                  # If NO uploads are allowed YaBB sets this default limit
                  # to 1 MB. Change this values if you get error messages.
 -                $CGI:OST_MAX = 1_000_000;
 +                $CGI:OST_MAX = 1048576;
              }

          # * adds volume, if a upload limit is set, to not get error if the other
  

This pretty much cleans up confusing extra spaces in error log and fixes how 1 MB is calculated in computer world
Using underscores in numeric literals is experimental and as such should be discouraged.