Changeset trunk,184

Show
Ignore:
Timestamp:
02/24/10 02:56:52 (5 months ago)
Author:
Suren A. Chilingaryan <csa@dside.dyndns.org>
revision id:
csa@dside.dyndns.org-20100224025652-n1w3zvvtyi2tm8wu
branch-nick:
adei
Message:

Fix using options specified for different database (stripped name, options for database instead of database_xxx)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/classes/options.php

    r146 r184  
    3232                elseif (($dname)&&(!strcmp(substr($regex, $slen, $dlen), $dname))) { 
    3333                    $pos = strpos($regex, "__", $slen + $dlen); 
    34  
    35                     if ($pos === false) $dopts = &$OPTIONS[$regex]; 
    36                     else if (($gname)&&(!strcmp(substr($regex, $pos + 2), $gname))) { 
     34                     
     35                    if (($pos === false)&&($len == ($slen + $dlen))) $dopts = &$OPTIONS[$regex]; 
     36                    else if (($gname)&&(!strcmp(substr($regex, $pos + 2), $gname))&&($pos == ($slen+$dlen))) { 
    3737                        $gopts = &$OPTIONS[$regex]; 
    3838                        if (($sopts)&&($dopts)) break;