diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-07-03 19:01:00 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-07-03 19:01:00 +0400 |
| commit | 2c695d62cd37f68e99f2668b0bea5f714f85089e (patch) | |
| tree | 56cdff521cf134779e1dc87e3dd5b18a60b18f56 /piwik.php | |
| parent | ba1e502962608ba822e8c1e56b5e8036f0900334 (diff) | |
fixes #1457 - remove E_EXCEPTION (couldn't find any documentation for this as a predefined PHP constant)
refs #998 - merge upgrade.php and common.php so json_decode() is available to Tracker plugins; sync up with -17 release of upgradephp
git-svn-id: http://dev.piwik.org/svn/trunk@2420 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'piwik.php')
| -rw-r--r-- | piwik.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,7 +31,7 @@ if(!defined('PIWIK_INCLUDE_PATH')) @ignore_user_abort(true); -require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/common.php'; +require_once PIWIK_INCLUDE_PATH .'/libs/upgradephp/upgrade.php'; require_once PIWIK_INCLUDE_PATH .'/libs/Event/Dispatcher.php'; require_once PIWIK_INCLUDE_PATH .'/libs/Event/Notification.php'; require_once PIWIK_INCLUDE_PATH .'/core/PluginsManager.php'; |