[evolvis-commits] r17966: QA branch pending merges:↵ Thorsten Glaser 2012-01-05 experimentally wrap the entire codendi crapcode into a db transaction↵ Thorsten Glaser 2012-01-05 better DB query tracing (after the release, always display errors)↵ Thorsten Glaser 2012-01-05 QA system hotfix: PHP warning
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Jan 9 13:38:14 CET 2012
Author: mirabilos
Date: 2012-01-09 13:38:14 +0100 (Mon, 09 Jan 2012)
New Revision: 17966
Modified:
trunk/gforge_base/evolvisforge-5.1/
trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php
trunk/gforge_base/evolvisforge-5.1/src/www/my/my_utils.php
trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php
Log:
QA branch pending merges:
Thorsten Glaser 2012-01-05 experimentally wrap the entire codendi crapcode into a db transaction
Thorsten Glaser 2012-01-05 better DB query tracing (after the release, always display errors)
Thorsten Glaser 2012-01-05 QA system hotfix: PHP warning
Property changes on: trunk/gforge_base/evolvisforge-5.1
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17877,17896
/branches/messer-51:17836,17838,17880-17882,17894-17895
/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17861,17935-17936
+ /trunk/gforge_base/evolvisforge-5.1:7226,17132-17168,17573-17576,17584,17592,17595,17631,17646-17652,17877,17896
/branches/messer-51:17836,17838,17880-17882,17894-17895
/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17861,17935-17936,17945,17956-17958
Modified: svk:merge
- 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17936
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17881
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17895
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17877
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17896
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226
+ 8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17936
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/QA-2011Q4:evolvis-qs.lan.tarent.de:17958
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17838
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17881
8ed69402-faa4-4b47-986e-66d49b2a90d8:/branches/messer-51:17895
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17168
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17584
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17592
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17595
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17631
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17652
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17877
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:17896
8ed69402-faa4-4b47-986e-66d49b2a90d8:/trunk/gforge_base/evolvisforge-5.1:7226
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php 2012-01-09 12:38:05 UTC (rev 17965)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/database-pgsql.php 2012-01-09 12:38:14 UTC (rev 17966)
@@ -173,12 +173,12 @@
$qstring=$qstring." LIMIT $limit OFFSET $offset";
}
+ $res = @pg_query($dbserver,$qstring);
if ($sysdebug_dbquery) {
- ffDebug('trace', "tracing call of db_query():\n",
- debug_string_backtrace());
+ ffDebug('trace', "tracing " .
+ ($res ? "successful" : sprintf("failed(%s)", db_error())) .
+ " call of db_query():\n", debug_string_backtrace());
}
-
- $res = @pg_query($dbserver,$qstring);
if (!$res) {
error_log('SQL: '. preg_replace('/\n\t+/', ' ',$qstring));
error_log('SQL> '.db_error());
@@ -254,13 +254,12 @@
$qstring=$qstring." LIMIT $limit OFFSET $offset";
}
+ $res = @pg_query_params($dbserver,$qstring,$params);
if ($sysdebug_dbquery) {
- ffDebug('trace', "tracing call of db_query_params():\n",
- debug_string_backtrace());
- error_log('SQL: '.db_query_to_string($qstring,$params).'; ');
+ ffDebug('trace', "tracing " .
+ ($res ? "successful" : sprintf("failed(%s)", db_error())) .
+ " call of db_query_params():\n", debug_string_backtrace());
}
-
- $res = @pg_query_params($dbserver,$qstring,$params);
if (!$res) {
error_log('SQL: '. preg_replace('/\n\t+/', ' ',$qstring));
error_log('SQL> '.db_error($dbserver));
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/my/my_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/my/my_utils.php 2012-01-09 12:38:05 UTC (rev 17965)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/my/my_utils.php 2012-01-09 12:38:14 UTC (rev 17966)
@@ -81,7 +81,9 @@
function my_hide($svc, $db_item_id, $item_id, $hide) {
$pref_name = 'my_hide_'.$svc.$db_item_id;
$old_pref_value = UserManager::instance()->getCurrentUser()->getPreference($pref_name);
- list($old_hide,$old_count) = explode('|', $old_pref_value);
+ $tmp = explode('|', $old_pref_value);
+ $old_hide = util_ifsetor($tmp[0]);
+ $old_count = util_ifsetor($tmp[1]);
// Make sure they are both 0 if never set before
if ($old_hide == false) { $old_hide = 0; }
Modified: trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php 2012-01-09 12:38:05 UTC (rev 17965)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/widgets/updatelayout.php 2012-01-09 12:38:14 UTC (rev 17966)
@@ -33,6 +33,7 @@
$owner = $request->get('owner');
if ($owner) {
+ db_begin();
$owner_id = (int)substr($owner, 1);
$owner_type = substr($owner, 0, 1);
switch($owner_type) {
@@ -111,6 +112,7 @@
}
}
}
+ db_commit();
}
if (!$request->isAjax()) {
htmlRedirect($redirect);
More information about the evolvis-commits
mailing list