comparison index.php @ 60:63ea1cfd387d

Branch merge
author Tom Fredrik "BFG" Klaussen <bfg@blenning.no>
date Thu, 11 Oct 2012 17:05:25 +0200
parents 0e157721bbad
children b7efe2ecbc11
comparison
equal deleted inserted replaced
57:fd3dd497eba6 60:63ea1cfd387d
57 $parent->insertBefore($clonedChild, $param); 57 $parent->insertBefore($clonedChild, $param);
58 } 58 }
59 $parent->removeChild($param); 59 $parent->removeChild($param);
60 } 60 }
61 } 61 }
62 $master = getFiles($master, $options);
62 63
63 if (CACHING && $cacheable) 64 if (CACHING && $cacheable)
64 $options->getCache()->CheckHttpModified(); 65 $options->getCache()->CheckHttpModified();
65 66
66 print $master->saveXml($master); 67 print $master->saveXml($master);