SF.net SVN: squirrelmail: [12494] trunk/squirrelmail/include/languages.php

Revision: 12494
          
http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12494&view=rev
Author:   pdontthink
Date:     2007-06-29 16:29:09 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
Make sq_change_text_domain() return previous text domain

Modified Paths:
--------------
    trunk/squirrelmail/include/languages.php

Modified: trunk/squirrelmail/include/languages.php
===================================================================
--- trunk/squirrelmail/include/languages.php    2007-06-29 21:34:20 UTC (rev 
12493)
+++ trunk/squirrelmail/include/languages.php    2007-06-29 23:29:09 UTC (rev 
12494)
@@ -40,28 +40,33 @@
  *                            (OPTIONAL; default is SquirrelMail
  *                            locale directory).
  *
- * @return void
+ * @return string The name of the text domain that was set
+ *                *BEFORE* it is changed herein - NOTE that
+ *                this differs from PHP's textdomain() 
  *
  * @since 1.5.2 and 1.4.10 
  */
 function sq_change_text_domain($domain_name, $directory='') {
 
-    if (empty($directory)) $directory = SM_PATH . 'locale/';
-
     static $domains_already_seen = array();
+    global $gettext_domain;
+    $return_value = $gettext_domain;
 
     // only need to call bindtextdomain() once 
     //
     if (in_array($domain_name, $domains_already_seen)) {
         sq_textdomain($domain_name);
-        return;
+        return $return_value;
     }
 
     $domains_already_seen[] = $domain_name;
 
+    if (empty($directory)) $directory = SM_PATH . 'locale/';
+
     sq_bindtextdomain($domain_name, $directory);
     sq_textdomain($domain_name);
 
+    return $return_value;
 }
 
 /**


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

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/