Index: trunk/core/units/general/inp1_parser.php =================================================================== diff -u -N -r2651 -r2725 --- trunk/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 2651) +++ trunk/core/units/general/inp1_parser.php (.../inp1_parser.php) (revision 2725) @@ -74,7 +74,7 @@ $pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList, $objSmileys, $objPMList; - $pathtoroot = "./"; + $pathtoroot = $this->Application->IsAdmin() ? '../' : './'; $pathtoroot = realpath($pathtoroot)."/"; if (!file_exists($pathtoroot."config.php")) { Index: trunk/admin/install/upgrades/readme_1_1_2.txt =================================================================== diff -u -N -r2645 -r2725 --- trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2645) +++ trunk/admin/install/upgrades/readme_1_1_2.txt (.../readme_1_1_2.txt) (revision 2725) @@ -4,4 +4,5 @@ 0008467 - Admin, Item Edit -> Categories tab shows only first 20 categories. fixed. 0008754 - added tag for category image and image list output 0008627 - install script still shows upgrade option when no upgrade possible (fixed) -0008791 - Ability to set First Day Of Week in Configuration (used in affiliate processing) \ No newline at end of file +0008791 - Ability to set First Day Of Week in Configuration (used in affiliate processing) +0008943 - Email events with mixed tags sent from admin caused error \ No newline at end of file Index: trunk/kernel/units/general/inp1_parser.php =================================================================== diff -u -N -r2651 -r2725 --- trunk/kernel/units/general/inp1_parser.php (.../inp1_parser.php) (revision 2651) +++ trunk/kernel/units/general/inp1_parser.php (.../inp1_parser.php) (revision 2725) @@ -74,7 +74,7 @@ $pathchar, $objTemplate, $objTopicList, $objArticleList, $objPostingList, $objCensorList, $objSmileys, $objPMList; - $pathtoroot = "./"; + $pathtoroot = $this->Application->IsAdmin() ? '../' : './'; $pathtoroot = realpath($pathtoroot)."/"; if (!file_exists($pathtoroot."config.php")) {