Merge branch 'hotfix/1.3.2.2'

pluginsGLPI · Dec 7, 2016 · 18d7340 · 18d7340
2 parents 7504e43 + 03dad5e
commit 18d7340
Show file tree

Hide file tree

Showing 4 changed files with 660 additions and 2 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -25,6 +25,12 @@
    padding: 5px 15px;
 }
 
+.plugin_news_alert-content ul {
+   list-style: inherit;
+   margin:     inherit;
+   padding:    inherit;
+}
+
 .plugin_news_alert-login .plugin_news_alert-content {
    max-height: 0;
    padding: 0;

diff --git a/plugin.xml b/plugin.xml
@@ -41,6 +41,11 @@ Features
       <author>TECLIB'</author>
    </authors>
    <versions>
+      <version>
+         <num>1.3.2.2</num>
+         <compatibility>0.90.1</compatibility>
+         <compatibility>9.1</compatibility>
+      </version>
       <version>
          <num>1.3.2</num>
          <compatibility>0.90.1</compatibility>

diff --git a/setup.php b/setup.php
@@ -21,15 +21,18 @@
  --------------------------------------------------------------------------
 */
 
-define ('PLUGIN_NEWS_VERSION', '1.3.2.1');
+define ('PLUGIN_NEWS_VERSION', '1.3.2.2');
 
 function plugin_init_news() {
    global $PLUGIN_HOOKS;
 
    $PLUGIN_HOOKS['csrf_compliant']['news'] = true;
 
    $plugin = new Plugin();
-   if ($plugin->isInstalled('news') && $plugin->isActivated('news')) {
+   if (Session::checkValidSessionId()
+       && isset($_SESSION['glpiactiveentities_string'])
+       && $plugin->isInstalled('news')
+       && $plugin->isActivated('news')) {
       Plugin::registerClass('PluginNewsProfile', array('addtabon' => 'Profile'));
 
       $PLUGIN_HOOKS['add_css']['news'] = 'css/styles.css';