Changeset 16180


Ignore:
Timestamp:
Jun 29, 2012, 5:10:09 PM (8 years ago)
Author:
mistic100
Message:

merge r16179 from trunk
bug 2671: use get_branch_from_version() to find the real branch, however the version looks like

Location:
branches/2.4/admin/include
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/admin/include/languages.class.php

    r12922 r16180  
    235235        $version = $pem_versions[0]['name'];
    236236      }
    237       $branch = substr($version, 0, strrpos($version, '.'));
     237      $branch = get_branch_from_version($version);
    238238      foreach ($pem_versions as $pem_version)
    239239      {
  • branches/2.4/admin/include/plugins.class.php

    r16178 r16180  
    276276        $version = $pem_versions[0]['name'];
    277277      }
    278      
    279       if (substr_count($version, '.') > 1)
    280       {
    281         $branch = substr($version, 0, strrpos($version, '.'));
    282       }
    283       else
    284       {
    285         $branch = $version;
    286       }
    287      
     278      $branch = get_branch_from_version($version);
    288279      foreach ($pem_versions as $pem_version)
    289280      {
  • branches/2.4/admin/include/themes.class.php

    r13460 r16180  
    472472        $version = $pem_versions[0]['name'];
    473473      }
    474       $branch = substr($version, 0, strrpos($version, '.'));
     474      $branch = get_branch_from_version($version);
    475475      foreach ($pem_versions as $pem_version)
    476476      {
  • branches/2.4/admin/include/updates.class.php

    r15680 r16180  
    6464        $version = $pem_versions[0]['name'];
    6565      }
    66       $branch = substr($version, 0, strrpos($version, '.'));
     66      $branch = get_branch_from_version($version);
    6767      foreach ($pem_versions as $pem_version)
    6868      {
Note: See TracChangeset for help on using the changeset viewer.