Changeset 16179


Ignore:
Timestamp:
06/29/12 17:08:00 (7 years ago)
Author:
mistic100
Message:

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

Location:
trunk/admin/include
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/languages.class.php

    r12922 r16179  
    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      { 
  • trunk/admin/include/plugins.class.php

    r16177 r16179  
    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      { 
  • trunk/admin/include/themes.class.php

    r13460 r16179  
    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      { 
  • trunk/admin/include/updates.class.php

    r15680 r16179  
    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.