* removing old PHP version check and leaving only fix from PhilD
Merge master into forum
implemented function that calculates line number in file where pattern match was found