Merge pull request #5983 from relldoesphp/CRM-16544

[civicrm-core.git] / CRM / Core / I18n.php

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index 330fdd67089ae5d30610b342c33fe119317144bd..a36389ec7f14a9d9039895b29dc433b0877f105c 100644 (file)
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -268,6 +268,9 @@ class CRM_Core_I18n {
       $domain = NULL;
     }
 
+    $raw = !empty($params['raw']);
+    unset($params['raw']);
+
     if (!empty($domain)) {
       // It might be prettier to cast to an array, but this is high-traffic stuff.
       if (is_array($domain)) {
@@ -288,7 +291,7 @@ class CRM_Core_I18n {
     }
 
     // replace the numbered %1, %2, etc. params if present
-    if (count($params)) {
+    if (count($params) && !$raw) {
       $text = $this->strarg($text, $params);
     }
 
@@ -510,6 +513,8 @@ class CRM_Core_I18n {
 
   /**
    * Static instance provider - return the instance for the current locale.
+   *
+   * @return CRM_Core_I18n
    */
   public static function &singleton() {
     static $singleton = array();