[SM-CVS] SF.net SVN: squirrelmail:[14697] branches/SM-1_4-STABLE/squirrelmail/src/ search.php

[Paul Lesniewski via squirrelmail-cvs]

Revision: 14697
http://sourceforge.net/p/squirrelmail/code/14697
Author: pdontthink
Date: 2017-07-01 07:42:44 +0000 (Sat, 01 Jul 2017)
Log Message:
-----------
Translated strings should not determine logic

Modified Paths:
--------------
branches/SM-1_4-STABLE/squirrelmail/src/search.php

Modified: branches/SM-1_4-STABLE/squirrelmail/src/search.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/search.php 2017-06-28 21:29:22 UTC (rev 14696)
+++ branches/SM-1_4-STABLE/squirrelmail/src/search.php 2017-07-01 07:42:44 UTC (rev 14697)
@@ -324,12 +324,7 @@
sm_validate_security_token($submitted_token, -1, TRUE);
}

-if ($submit == _("Search") && !empty($what)) {
- if ($recent_count > 0) {
- update_recent($what, $where, $mailbox, $username, $data_dir);
- }
-}
-elseif ($submit == 'forget' && isset($count)) {
+if ($submit == 'forget' && isset($count)) {
forget_recent($count, $username, $data_dir);
}
elseif ($submit == 'save' && isset($count)) {
@@ -338,6 +333,12 @@
elseif ($submit == 'delete' && isset($count)) {
delete_saved($count, $username, $data_dir);
}
+elseif (!empty($submit) && !empty($what)) {
+ $submit = _("Search");
+ if ($recent_count > 0) {
+ update_recent($what, $where, $mailbox, $username, $data_dir);
+ }
+}

do_hook('search_before_form');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.