Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1651) +++ branches/2.8.x/CHANGELOG (revision 1652) @@ -11,9 +11,10 @@ ! = Update/Change =============================================================================== +27 Mar-2012 Build 1652 Dietmar Woellbrink (Luisehahne) +! fixed path to globalExceptionHandler.php in wysiwyg 26 Mar-2012 Build 1651 Werner v.d.Decken(DarkViper) # fixed a little problem with chmod() -+ add argument 'replyTo' into class.wb::mail() 24 Mar-2012 Build 1650 Werner v.d.Decken(DarkViper) + add argument 'replyTo' into class.wb::mail() 24 Mar-2012 Build 1649 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1651) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1652) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1651'); +if(!defined('REVISION')) define('REVISION', '1652'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/modules/wysiwyg/view.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/view.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/view.php (revision 1652) @@ -7,7 +7,7 @@ * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -17,7 +17,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { - require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); throw new IllegalFileException(); } /* -------------------------------------------------------- */ Index: branches/2.8.x/wb/modules/wysiwyg/info.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/info.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/info.php (revision 1652) @@ -7,7 +7,7 @@ * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -17,7 +17,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { - require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); throw new IllegalFileException(); } /* -------------------------------------------------------- */ Index: branches/2.8.x/wb/modules/wysiwyg/search.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/search.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/search.php (revision 1652) @@ -8,7 +8,7 @@ * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL: http://svn.websitebaker2.org/branches/2.8.x/wb/admin/users/save.php $ @@ -15,8 +15,13 @@ * @lastmodified $Date: 2011-01-10 13:21:47 +0100 (Mo, 10. Jan 2011) $ * */ -// Must include code to stop this file being access directly -if(defined('WB_PATH') == false) { die("Cannot access this file directly"); } +/* -------------------------------------------------------- */ +// Must include code to stop this file being accessed directly +if(!defined('WB_PATH')) { + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); +} +/* -------------------------------------------------------- */ function wysiwyg_search($func_vars) { extract($func_vars, EXTR_PREFIX_ALL, 'func'); Index: branches/2.8.x/wb/modules/wysiwyg/install.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/install.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/install.php (revision 1652) @@ -7,7 +7,7 @@ * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -17,7 +17,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { - require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); throw new IllegalFileException(); } /* -------------------------------------------------------- */ Index: branches/2.8.x/wb/modules/wysiwyg/modify.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/modify.php (revision 1652) @@ -7,7 +7,7 @@ * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -18,7 +18,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { - require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); throw new IllegalFileException(); } /* -------------------------------------------------------- */ Index: branches/2.8.x/wb/modules/wysiwyg/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/upgrade.php (revision 1651) +++ branches/2.8.x/wb/modules/wysiwyg/upgrade.php (revision 1652) @@ -7,7 +7,7 @@ * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -17,7 +17,7 @@ /* -------------------------------------------------------- */ // Must include code to stop this file being accessed directly if(!defined('WB_PATH')) { - require_once(dirname(dirname(__FILE__)).'/framework/globalExceptionHandler.php'); + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); throw new IllegalFileException(); } /* -------------------------------------------------------- */