Merge remote-tracking branch 'origin/xorg/maint' into xorg/master

diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php
index 9b6f78d..c23f7d1 100755 (executable)
--- a/bin/cron/google_apps.php
+++ b/bin/cron/google_apps.php
@@ -111,7 +111,7 @@ while ($nickname = $res->next()) {
 $res = XDB::iterator(
     "SELECT  g.l_userid AS id, g.g_nickname AS nickname
        FROM  gapps_nicknames AS g
-  LEFT JOIN  email_source_account AS s ON (s.uid = g.l_userid AND s.type = 'forlife' AND s.email = g.g_nickname)
+  LEFT JOIN  email_source_account AS s ON (s.uid = g.l_userid AND s.type = 'alias' AND s.email = g.g_nickname)
       WHERE  g.l_userid IS NOT NULL AND s.email IS NULL");
 while ($nickname = $res->next()) {
     XDB::execute(

diff --git a/core b/core
index ed4f7de..277bb52 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit ed4f7de016bb136fae9f72256c827ef09d4ea863
+Subproject commit 277bb52765efb79e31092f5555a750146d379987

diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php
index fc9cf18..feed3d9 100644 (file)
--- a/modules/auth/auth.inc.php
+++ b/modules/auth/auth.inc.php
@@ -62,10 +62,10 @@ function gpex_make($chlg, $privkey, $datafields, $charset)
         } else if (isset($personnal_data[$val])) {
             $params .= gpex_prepare_param($val, $personnal_data[$val], $tohash, $charset);
         } else if ($val == 'username') {
-            $min_username = $XDB::fetchOneCell('SELECT  email
-                                                  FROM  email_source_account
-                                                 WHERE  uid = {?} FIND_IN_SET(\'bestalias\', flags)',
-                                               S::i('uid'));
+            $min_username = XDB::fetchOneCell('SELECT  email
+                                                 FROM  email_source_account
+                                                WHERE  uid = {?} AND FIND_IN_SET(\'bestalias\', flags)',
+                                              S::i('uid'));
             $params      .= gpex_prepare_param($val, $min_username, $tohash, $charset);
         } else if ($val == 'grpauth') {
             if (isset($_GET['group'])) {

diff --git a/modules/platal.php b/modules/platal.php
index 11b6b85..5f49945 100644 (file)
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -21,7 +21,7 @@
 
 function bugize($list)
 {
-    $list = preg_split('/,/', Env::s('libs'), -1, PREG_SPLIT_NO_EMPTY);
+    $list = preg_split('/,/', $list, -1, PREG_SPLIT_NO_EMPTY);
     $ans  = array();
 
     foreach ($list as $bug) {