Index: branches/5.0.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r13332 -r13528
--- branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 13332)
+++ branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 13528)
@@ -1,6 +1,6 @@
Application->ParseBlock($block_params);
$filter_menu = $this->Application->getUnitOption($this->Prefix,'FilterMenu');
if (!$filter_menu) {
- trigger_error('no filters defined for prefix '.$this->Prefix.', but DrawFilterMenu tag used', E_USER_WARNING);
+ trigger_error('no filters defined for prefix '.$this->Prefix.', but DrawFilterMenu tag used', E_USER_NOTICE);
return '';
}
@@ -147,7 +147,7 @@
{
$refresh_intervals = $this->Application->ConfigValue('AutoRefreshIntervals');
if (!$refresh_intervals) {
- trigger_error('no filters defined for prefix '.$this->Prefix.', but DrawAutoRefreshMenu tag used', E_USER_WARNING);
+ trigger_error('no refresh intervals defined for prefix '.$this->Prefix.', but DrawAutoRefreshMenu tag used', E_USER_NOTICE);
return '';
}
@@ -2468,7 +2468,7 @@
$title_presets = $this->Application->getUnitOption($this->Prefix, 'TitlePresets');
if (!array_key_exists($preset_name, $title_presets)) {
- trigger_error('Title preset not specified or missing (in tag "' . $this->getPrefixSpecial() . ':' . __METHOD__ . '")', E_USER_WARNING);
+ trigger_error('Title preset not specified or missing (in tag "' . $this->getPrefixSpecial() . ':' . __METHOD__ . '")', E_USER_NOTICE);
return false;
}
Index: branches/5.0.x/core/kernel/db/dblist.php
===================================================================
diff -u -N -r12734 -r13528
--- branches/5.0.x/core/kernel/db/dblist.php (.../dblist.php) (revision 12734)
+++ branches/5.0.x/core/kernel/db/dblist.php (.../dblist.php) (revision 13528)
@@ -1,6 +1,6 @@
appendTrace();
}
- trigger_error('Depricated method kDBList->SetWhereClause. Use kDBList->addFilter instead.', E_USER_ERROR);
+ trigger_error('Depricated method kDBList->SetWhereClause. Use kDBList->addFilter instead.', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
}
/**
@@ -647,7 +647,7 @@
}
if (!isset($this->Fields[$field]) && $field != 'RAND()' && !$is_expression) {
- trigger_error('Incorrect sorting defined (field = '.$field.'; direction = '.$direction.') in config for prefix '.$this->Prefix.'', E_USER_WARNING);
+ trigger_error('Incorrect sorting defined (field = '.$field.'; direction = '.$direction.') in config for prefix '.$this->Prefix.'', E_USER_NOTICE);
}
$this->OrderFields[] = Array($field, $direction, $is_expression);
Index: branches/5.0.x/core/units/helpers/sections_helper.php
===================================================================
diff -u -N -r12734 -r13528
--- branches/5.0.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 12734)
+++ branches/5.0.x/core/units/helpers/sections_helper.php (.../sections_helper.php) (revision 13528)
@@ -1,6 +1,6 @@
Tree[$section_name]) ? $this->Tree[$section_name] : Array();
if ($current_data) {
- trigger_error('Section "' . $section_name . '" declaration (originally defined in "' . $current_data['SectionPrefix'] . '") was overwriten from "' . $prefix . '"', E_USER_NOTICE);
+ trigger_error('Section "' . $section_name . '" declaration (originally defined in "' . $current_data['SectionPrefix'] . '") was overwriten from "' . $prefix . '"', E_USER_WARNING);
}
$this->Tree[$section_name] = array_merge_recursive2($current_data, $section_params);
Index: branches/5.0.x/core/install/install_toolkit.php
===================================================================
diff -u -N -r13333 -r13528
--- branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 13333)
+++ branches/5.0.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 13528)
@@ -1,6 +1,6 @@
INIFile) && !is_writable(dirname($this->INIFile))) {
- trigger_error('Cannot write to "' . $this->INIFile . '" file.', $silent ? E_USER_NOTICE : E_USER_ERROR);
+ trigger_error('Cannot write to "' . $this->INIFile . '" file.', $silent ? E_USER_WARNING : E_USER_ERROR);
return ;
}
Index: branches/5.0.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r13203 -r13528
--- branches/5.0.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 13203)
+++ branches/5.0.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 13528)
@@ -1,6 +1,6 @@
specialsToRemove as $prefix_special => $flag) {
if ($flag && strpos($prefix_special, '.') === false) {
unset($this->specialsToRemove[$prefix_special]);
- trigger_error('Incorrect usage of "remove_specials['.$prefix_special.']" field (no special found)', E_USER_WARNING);
+ trigger_error('Incorrect usage of "remove_specials['.$prefix_special.']" field (no special found)', E_USER_NOTICE);
}
}
$this->_Params = $this->removeSpecials($this->_Params);
Index: branches/5.0.x/core/units/helpers/custom_fields_helper.php
===================================================================
diff -u -N -r13372 -r13528
--- branches/5.0.x/core/units/helpers/custom_fields_helper.php (.../custom_fields_helper.php) (revision 13372)
+++ branches/5.0.x/core/units/helpers/custom_fields_helper.php (.../custom_fields_helper.php) (revision 13528)
@@ -1,6 +1,6 @@
Application->Debugger->appendTrace();
}
- trigger_error('Invalid symbol in ValueList field [' . substr($values_list, 0, 100) . ' ...]' , E_USER_NOTICE);
+ trigger_error('Invalid symbol in ValueList field [' . substr($values_list, 0, 100) . ' ...]' , E_USER_WARNING);
return Array ();
}
Index: branches/5.0.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r13289 -r13528
--- branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 13289)
+++ branches/5.0.x/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 13528)
@@ -1,6 +1,6 @@
0) {
foreach ($hooks as $hook) {
if (isset($config['ParentPrefix']) && $hook['HookToPrefix'] == $config['ParentPrefix']) {
- trigger_error('Depricated Hook Usage [prefix: '.$config['Prefix'].'; do_prefix: '.$hook['DoPrefix'].'] use #PARENT# as HookToPrefix value, where HookToPrefix is same as ParentPrefix', E_USER_NOTICE);
+ trigger_error('Depricated Hook Usage [prefix: '.$config['Prefix'].'; do_prefix: '.$hook['DoPrefix'].'] use #PARENT# as HookToPrefix value, where HookToPrefix is same as ParentPrefix', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
}
if ($hook['HookToPrefix'] == '') {
@@ -558,7 +558,7 @@
foreach ($config['AggregateTags'] as $aggregate_tag) {
if (isset($config['ParentPrefix'])) {
if ($aggregate_tag['AggregateTo'] == $config['ParentPrefix']) {
- trigger_error('Depricated Aggregate Tag Usage [prefix: '.$config['Prefix'].'; AggregateTo: '.$aggregate_tag['AggregateTo'].'] use #PARENT# as AggregateTo value, where AggregateTo is same as ParentPrefix', E_USER_NOTICE);
+ trigger_error('Depricated Aggregate Tag Usage [prefix: '.$config['Prefix'].'; AggregateTo: '.$aggregate_tag['AggregateTo'].'] use #PARENT# as AggregateTo value, where AggregateTo is same as ParentPrefix', defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_NOTICE);
}
if ($aggregate_tag['AggregateTo'] == '#PARENT#') {
Index: branches/5.0.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r13407 -r13528
--- branches/5.0.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 13407)
+++ branches/5.0.x/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 13528)
@@ -1,6 +1,6 @@
Application->isDebugMode()) {
$this->Application->Debugger->appendTrace();
}
- trigger_error('ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in checkItemStatus, leading to "404 Not Found"', E_USER_WARNING);
+ trigger_error('ItemLoad Permission Failed for prefix [' . $event->getPrefixSpecial() . '] in checkItemStatus, leading to "404 Not Found"', E_USER_NOTICE);
header('HTTP/1.0 404 Not Found');
@@ -532,7 +532,7 @@
$this->Application->Debugger->appendTrace();
}
- trigger_error('ItemLoad Permission Failed for prefix ['.$event->getPrefixSpecial().'] in '.($status_checked ? 'checkItemStatus' : 'CheckPermission').'', E_USER_WARNING);
+ trigger_error('ItemLoad Permission Failed for prefix ['.$event->getPrefixSpecial().'] in '.($status_checked ? 'checkItemStatus' : 'CheckPermission').'', E_USER_NOTICE);
$template = $this->Application->isAdmin ? 'no_permission' : $this->Application->ConfigValue('NoPermissionTemplate');
if (MOD_REWRITE) {
@@ -1173,12 +1173,12 @@
* @access protected
*/
function OnUpdate(&$event)
- {
+ {
if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
$event->status = erFAIL;
return;
}
-
+
$object =& $event->getObject( Array('skip_autoload' => true) );
$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
Index: branches/5.0.x/core/kernel/event_manager.php
===================================================================
diff -u -N -r13274 -r13528
--- branches/5.0.x/core/kernel/event_manager.php (.../event_manager.php) (revision 13274)
+++ branches/5.0.x/core/kernel/event_manager.php (.../event_manager.php) (revision 13528)
@@ -1,6 +1,6 @@
loadConfig($event->Prefix);
if( !$this->Application->prefixRegistred($event->Prefix) )
{
- trigger_error('Prefix '.$event->Prefix.' not registred (requested event '.$event->Name.')', E_USER_NOTICE);
+ trigger_error('Prefix '.$event->Prefix.' not registred (requested event '.$event->Name.')', E_USER_WARNING);
return false;
}
}