0
@@ -98,7 +98,7 @@ class Gettext
0
   end
0
 
0
   def scan_normal(text, line, filename, clean_filename)
0
-    text.gsub(/__\(("|')([^"]+)\1#{@domain}\)/) do
0
+    text.gsub(/__\(("|')([^\1]+)\1#{@domain}\)/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => false,
0
@@ -110,7 +110,7 @@ class Gettext
0
   end
0
 
0
   def scan_filter(text, line, filename, clean_filename)
0
-    text.gsub(/_f\(("|')([^"]+)\1, .*?#{@domain}\)/) do
0
+    text.gsub(/_f\(("|')([^\1]+)\1, .*?#{@domain}\)/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => true,
0
@@ -122,7 +122,7 @@ class Gettext
0
   end
0
 
0
   def scan_plural(text, line, filename, clean_filename)
0
-    text.gsub(/_p\(("|')([^"]+)\1, ("|')([^"]+)\3, .*?#{@domain}\)/) do
0
+    text.gsub(/_p\(("|')([^\1]+)\1, ("|')([^\3]+)\3, .*?#{@domain}\)/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => true,
0
@@ -134,7 +134,7 @@ class Gettext
0
   end
0
 
0
   def scan_twig(text, line, filename, clean_filename)
0
-    text.gsub(/("|')([^"]+)\1 ?\| ?translate(?!_plural)#{@twig_domain}(?! ?\| ?format)/) do
0
+    text.gsub(/("|')([^\1]+)\1 ?\| ?translate(?!_plural)#{@twig_domain}(?! ?\| ?format)/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => false,
0
@@ -146,7 +146,7 @@ class Gettext
0
   end
0
 
0
   def scan_twig_filter(text, line, filename, clean_filename)
0
-    text.gsub(/("|')([^"]+)\1 ?\| ?translate(?!_plural)#{@twig_domain} ?\| ?format\(.*?\).*?/) do
0
+    text.gsub(/("|')([^\1]+)\1 ?\| ?translate(?!_plural)#{@twig_domain} ?\| ?format\(.*?\).*?/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => true,
0
@@ -158,7 +158,7 @@ class Gettext
0
   end
0
 
0
   def scan_twig_plural(text, line, filename, clean_filename)
0
-    text.gsub(/("|')([^"]+)\1 ?\| ?translate_plural\(("|')([^"]+)\3, .*?#{@domain}\) ?\| ?format\(.*?\)/) do
0
+    text.gsub(/("|')([^\1]+)\1 ?\| ?translate_plural\(("|')([^\3]+)\3, .*?#{@domain}\) ?\| ?format\(.*?\)/) do
0
       if @translations[$2].nil?
0
         @translations[$2] = { :places => [clean_filename + ":" + line.to_s],
0
                               :filter => true,

0
@@ -193,6 +193,14 @@
0
       return $query;
0
     }
0
 
0
+    /**
0
+     * Function: tablefy
0
+     * Automatically prepends tables and table prefixes to a field if it doesn't already have them.
0
+     *
0
+     * Parameters:
0
+     *     $field - The field to "tablefy".
0
+     *     $tables - An array of tables. The first one will be used for prepending.
0
+     */
0
     public static function tablefy(&$field, $tables) {
0
       if (!preg_match_all("/(\(|^)?([a-z_\.]+)/", $field, $matches))
0
         return;
0
@@ -207,7 +215,7 @@
0
         # Does it not already have a table specified?
0
         if (!substr_count($full, ".")) {
0
                                # Don't replace things that are already either prefixed or paramized.
0
-          $field = preg_replace("/([^\.:'_]|^)".preg_quote($full, "/")."/",
0
+          $field = preg_replace("/([^\.:'\"_]|^)".preg_quote($full, "/")."/",
0
                                 "\\1".$paren."__".$tables[0].".".$name,
0
                                 $field,
0
                                 1);
0
@@ -215,7 +223,7 @@
0
           # Okay, it does, but is the table prefixed?
0
           if (substr($full, 0, 2) != "__") {
0
                                    # Don't replace things that are already either prefixed or paramized.
0
-            $field = preg_replace("/([^\.:'_]|^)".preg_quote($full, "/")."/",
0
+            $field = preg_replace("/([^\.:'\"_]|^)".preg_quote($full, "/")."/",
0
                                   "\\1".$paren."__".$name,
0
                                   $field,
0
                                   1);