Merge branch 'master' into feature/twofactor

Geeklog-Core · Dec 11, 2017 · 4757397 · 4757397
2 parents 5a168af + 18da37a
commit 4757397
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 0 deletions.
diff --git a/plugins/staticpages/functions.inc b/plugins/staticpages/functions.inc
@@ -1597,6 +1597,8 @@ function plugin_upgrade_staticpages()
                         DB_query($sql);
                     }
                 }
+
+                SP_update_ConfValues_1_7_0();
 
                 $current_version = '1.7.0';
                 break;

diff --git a/plugins/staticpages/install_updates.php b/plugins/staticpages/install_updates.php
@@ -89,3 +89,19 @@ function SP_update_ConfValues_1_6_5()
 
     return true;
 }
+
+function SP_update_ConfValues_1_7_0()
+{
+    global $_CONF, $_TABLES, $_SP_DEFAULT;
+
+    require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+    $c = config::get_instance();
+
+    require_once $_CONF['path'] . 'plugins/staticpages/install_defaults.php';
+
+    // Hidden config option for Core used to determine language of staticpage url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_staticpages',array('staticpages', 'index.php', 'page'),'@hidden',7,31,1,1830,TRUE, 'Core', 31); 
+
+    return true;
+}
diff --git a/sql/updates/mysql_2.1.3_to_2.2.0.php b/sql/updates/mysql_2.1.3_to_2.2.0.php
@@ -69,6 +69,11 @@ function update_ConfValuesFor220()
     // Add config options to track invalid user login attempts
     $c->add('invalidloginattempts',7,'text',4,18,NULL,1710,TRUE, $me, 18);
     $c->add('invalidloginmaxtime',1200,'text',4,18,NULL,1720,TRUE, $me, 18);
+
+    // Hidden config option for Core used to determine language of topic url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_topic',array('', 'index.php', 'topic'),'@hidden',7,31,1,1830,TRUE, $me, 31); 
+    // Hidden config option for Core used to determine language of article url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, $me, 31); 
 
     return true;
 }

diff --git a/sql/updates/pgsql_2.1.3_to_2.2.0.php b/sql/updates/pgsql_2.1.3_to_2.2.0.php
@@ -69,6 +69,11 @@ function update_ConfValuesFor220()
     // Add config options to track invalid user login attempts
     $c->add('invalidloginattempts',7,'text',4,18,NULL,1710,TRUE, $me, 18);
     $c->add('invalidloginmaxtime',1200,'text',4,18,NULL,1720,TRUE, $me, 18);
+
+    // Hidden config option for Core used to determine language of topic url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_topic',array('', 'index.php', 'topic'),'@hidden',7,31,1,1830,TRUE, $me, 31); 
+    // Hidden config option for Core used to determine language of article url (see _getLanguageInfoFromURL in lib-common)
+    $c->add('langurl_article',array('', 'article.php', 'story'),'@hidden',7,31,1,1830,TRUE, $me, 31);     
 
     return true;
 }