Better fix for #2642
Better fix for #2642

changes made after discussion in #2723
tvs-prarthana/yii,softark/yii,jackey/YiiAPI-Framework,mudrezzz/testphp,lubosdz/yii,kurorido1990/dev-github,ImAnilChaudhari/yii,marcovtwout/yii,guber007/yii,ImAnilChaudhari/yii,Vartacom/yii,makasim/PayumYiiExtensionSandbox,Yanan1021/yii,tvs-prarthana/yii,yiisoft/yii,auburus/yii,scriptius/blog,er361/yii-zadanie-somnium,GerrGIT/yii,sachintaware/yii,yiichina/yii,sachintaware/yii,mudrezzz/testphp,scriptius/blog,YaDelivery/yii,GerrGIT/yii,longhua828/yii,marcovtwout/yii,longhua828/yii,makasim/PayumYiiExtensionSandbox,Yanan1021/yii,l3xthanzero/trackstar,mudrezzz/testphp,makasim/PayumYiiExtensionSandbox,longhua828/yii,janisto/yii,auburus/yii,phoenix3008/yii,phoenix3008/yii,scriptius/blog,Infowatch/yii,licailing/yii,tvs-prarthana/yii,lubosdz/yii,er361/yii-zadanie-somnium,janisto/yii,Vartacom/yii,intersvyaz/yii,Vartacom/yii,janisto/yii,lubosdz/yii,trewor-kapusta/yii,jackey/YiiAPI-Framework,Corfiot/yii,guber007/yii,licailing/yii,GerrGIT/yii,kurorido1990/dev-github,phoenix3008/yii,l3xthanzero/trackstar,softark/yii,Corfiot/yii,Infowatch/yii,intersvyaz/yii,Yanan1021/yii,GerrGIT/yii,trewor-kapusta/yii,mudrezzz/testphp,guber007/yii,scriptius/blog,ImAnilChaudhari/yii,lsjing/yii,ImAnilChaudhari/yii,er361/yii-zadanie-somnium,makasim/PayumYiiExtensionSandbox,tvs-prarthana/yii,YaDelivery/yii,lsjing/yii,kurorido1990/dev-github,YaDelivery/yii,lubosdz/yii,longhua828/yii,yiichina/yii,lsjing/yii,guber007/yii,wbfree/yii-tutorial,kurorido1990/dev-github,licailing/yii,yiisoft/yii,intersvyaz/yii,marcovtwout/yii,janisto/yii,marcovtwout/yii,licailing/yii,er361/yii-zadanie-somnium,yiichina/yii,auburus/yii,auburus/yii,sachintaware/yii,YaDelivery/yii,wbfree/yii-tutorial,phoenix3008/yii,sachintaware/yii,lsjing/yii,Vartacom/yii,l3xthanzero/trackstar