Index: trunk/admin/logs/email_log.php
===================================================================
diff -u -r402 -r446
--- trunk/admin/logs/email_log.php (.../email_log.php) (revision 402)
+++ trunk/admin/logs/email_log.php (.../email_log.php) (revision 446)
@@ -196,9 +196,9 @@
$objListView->IdField = "EmailLogId";
$objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
-$objListView->ColumnHeaders->Add("fromuser",admin_language("la_prompt_FromUsername"),1,0,$order,"width=\"35%\"","EmailsL_SortField","EmailsL_SortOrder","fromuser");
-$objListView->ColumnHeaders->Add("addressto",admin_language("la_prompt_AddressTo"),1,0,$order,"width=\"20%\"","EmailsL_SortField","EmailsL_SortOrder","addressto");
-$objListView->ColumnHeaders->Add("subject",admin_language("la_prompt_Subject"),1,0,$order,"width=\"10%\"","EmailsL_SortField","EmailsL_SortOrder","subject");
+$objListView->ColumnHeaders->Add("fromuser",admin_language("la_prompt_FromUsername"),1,0,$order,"width=\"25%\"","EmailsL_SortField","EmailsL_SortOrder","fromuser");
+$objListView->ColumnHeaders->Add("addressto",admin_language("la_prompt_AddressTo"),1,0,$order,"width=\"15%\"","EmailsL_SortField","EmailsL_SortOrder","addressto");
+$objListView->ColumnHeaders->Add("subject",admin_language("la_prompt_Subject"),1,0,$order,"width=\"30%\"","EmailsL_SortField","EmailsL_SortOrder","subject");
$objListView->ColumnHeaders->Add("event",admin_language("la_prompt_Event"),1,0,$order,"width=\"15%\"","EmailsL_SortField","EmailsL_SortOrder","event");
$objListView->ColumnHeaders->Add("time_sent",admin_language("la_prompt_SentOn"),1,0,$order,"width=\"20%\"","EmailsL_SortField","EmailsL_SortOrder","time_sent");
$objListView->ColumnHeaders->SetSort($objConfig->Get("EmailsL_SortField"),$order);
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -r422 -r446
--- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 422)
+++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 446)
@@ -996,8 +996,11 @@
if ($result === false)
{
$Errors->AddError("error.DatabaseError",NULL,$this->adodbConnection->ErrorMsg(),"",get_class($this),"Query_Item");
- echo '
'.$sql.'
';
- echo "Error: ".$this->adodbConnection->ErrorMsg()."
";
+ if($this->debuglevel) {
+ echo '
'.$sql.'
';
+ echo "Error: ".$this->adodbConnection->ErrorMsg()."
";
+ }
+ $this->Clear();
return false;
}
Index: trunk/kernel/parser.php
===================================================================
diff -u -r302 -r446
--- trunk/kernel/parser.php (.../parser.php) (revision 302)
+++ trunk/kernel/parser.php (.../parser.php) (revision 446)
@@ -3269,8 +3269,12 @@
}
else {
$ret = $objSearchCats->QueryItemCount;
- }
+ }
+ if ($ret == '') {
+ $ret = 0;
+ }
+
//echo $ret;
//$objSearchCats->QueryItemCount = $ret;
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -r389 -r446
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 389)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 446)
@@ -891,7 +891,7 @@
TWVzc2FnZXMgZnJvbSBTaXRlIEFkbWluIGFyZSBmcm9t
U2VsZWN0IFNvdXJjZSBMYW5ndWFnZQ==
SWNvbiBVUkw=
-Q29weSBMYWJlbHMgdG8gdGhpcyBMYW5ndWFnZQ==
+Q29weSBMYWJlbHMgdG8gdGhpcyBMYW5ndWFnZSBmcm9t
TGFuZ3VhZ2UgQ2FjaGUgVGltZW91dA==
TmV3IFRvcGlj
VGhhbmsgeW91IGZvciBSZWdpc3RlcmluZyEgIFBsZWFzZSBlbnRlciB5b3VyIHVzZXJuYW1lIGFuZCBwYXNzd29yZCBiZWxvdw==
@@ -1551,6 +1551,32 @@
RGF0YWJzZSBVc2VyIE5hbWU=
U2VydmVyIFBhc3N3b3Jk
VGFibGUgTmFtZSBQcmVmaXg=
+dXNlcl9tc24=
+dXNlcl9pY3E=
+dXNlcl9haW0=
+dXNlcl95YWhvbw==
+dXNlcl93ZWJzaXRl
+dXNlcl9vY2N1cGF0aW9u
+dXNlcl9pbnRlcmVzdHM=
+U2hvdyBFbWFpbCBMb2c=
+RXJyb3IgY29weWluZyBzdWJjYXRlZ29yaWVz
+RW1wdHkgc2VsZWN0aW9u
+TGFzdCBQb3N0
+UmF0ZSB0aGlzIGFydGljbGU=
+UmV2aWV3IGFydGljbGU=
+QXJ0aWNsZSBSZXZpZXdz
+UmV2aWV3IG5ld3MgYXJ0aWNsZQ==
+VGhlIHJldmlldyBoYXMgYmVlbiBhZGRlZA==
+VGhlIGFydGljbGUgcmV2aWV3IGhhcyBiZWVuIGFkZGVkIHRvIHRoZSBkYXRhYmFzZS4=
+SG90IExpbmtz
+U2hvdw==
+QXNjZW5kaW5n
+RGVzY2VuZGluZw==
+R28=
+U29ydA==
+S2V5d29yZA==
+U2VsZWN0IFRoZW1l
+VXNlcnMgT25saW5l
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTmV3IHVzZXIgaGFzIGJlZW4gYWRkZWQKCkEgbmV3IHVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBhZGRlZC4=
WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg==
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -r437 -r446
--- trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 437)
+++ trunk/kernel/include/emailmessage.php (.../emailmessage.php) (revision 446)
@@ -852,7 +852,7 @@
$sendTo = $ToAddr;
}
- $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$sendTo', '$Subject', $time, '$SendEvent')";
+ $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '$FromName', '$sendTo', '".str_replace("Subject:", "", $Subject)."', $time, '$SendEvent')";
$conn->Execute($sql);
if($HasFile)