Merge branch 'master' of ssh:https://github.com/OsTicket-Reloaded/OsTicket

Conflicts: translate/en/translate.php
OsTicket-Reloaded · Mar 10, 2012 · caf39dc · caf39dc
2 parents 0f6ae7e + 8bc4d89
commit caf39dc
Show file tree

Hide file tree

Showing 18 changed files with 1,369 additions and 373 deletions.
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
@@ -121,7 +121,7 @@ function mime_encode($text,$charset=null,$enc='utf-8') { //Thank in part to afte
  //Generic decoder - mirrors imap_utf8
  function mime_decode($text) {
 
- $a = imap_mime_header_decode($text);
+ $a = imap_utf8($text);
  $str = '';
  foreach ($a as $k => $part)
  $str.= $part->text;

diff --git a/index.html b/index.html
diff --git a/translate/en/staff/index.html b/translate/en/staff/index.html
diff --git a/translate/en/staff/refresh.gif b/translate/en/staff/refresh.gif
diff --git a/translate/en/staff/view_closed.gif b/translate/en/staff/view_closed.gif
diff --git a/translate/en/staff/view_open.gif b/translate/en/staff/view_open.gif
diff --git a/translate/en/translate.php b/translate/en/translate.php
diff --git a/translate/fr/translate.php b/translate/fr/translate.php
diff --git a/translate/pt_BR/translate.php b/translate/pt_BR/translate.php
diff --git a/translate/ru/client/new_ticket_title.jpg b/translate/ru/client/new_ticket_title.jpg
diff --git a/translate/ru/client/refresh_btn.gif b/translate/ru/client/refresh_btn.gif
diff --git a/translate/ru/client/ticket_status_title.jpg b/translate/ru/client/ticket_status_title.jpg
diff --git a/translate/ru/client/view_closed_btn.gif b/translate/ru/client/view_closed_btn.gif
diff --git a/translate/ru/client/view_open_btn.gif b/translate/ru/client/view_open_btn.gif
diff --git a/translate/ru/staff/refresh.gif b/translate/ru/staff/refresh.gif
diff --git a/translate/ru/staff/view_closed.gif b/translate/ru/staff/view_closed.gif
diff --git a/translate/ru/staff/view_open.gif b/translate/ru/staff/view_open.gif
diff --git a/translate/ru/translate.php b/translate/ru/translate.php