Minor code fixes

jbogdani · May 1, 2021 · 8aea3e3 · 8aea3e3
1 parent 30811a4
commit 8aea3e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/Out.php b/lib/Out.php
@@ -52,7 +52,7 @@ private function loadSettings($get, $lang = false)
 
     // Set page
         if ($get['page']) {
-            $this->cfg['page'] = (int)str_replace('/', null, $get['page']);
+            $this->cfg['page'] = (int)str_replace('/', '', $get['page']);
         }
 
         if ($get['art_title']) {
@@ -274,7 +274,7 @@ public function getArticleTags($article = false)
         if (!$this->data['article'][$article]['tags']) {
             $art = $this->getArticle();
 
-            if (!$art->id) {
+            if (!$art['id']) {
                 return false;
             }
 
@@ -529,7 +529,7 @@ private function setPageData()
         $this->data['page']['mission'] = cfg::get('mission');
 
         // IMAGE
-        $path2img = str_replace(utils::getBaseUrl(), null, $this->data['article'][$this->getTextId()]['art_img']['orig']);
+        $path2img = str_replace(utils::getBaseUrl(), '', $this->data['article'][$this->getTextId()]['art_img']['orig']);
 
         if (file_exists($path2img)) {
             // 1. check first for article image
@@ -830,7 +830,7 @@ public function getData($key = false)
                 require_once(SITE_DIR . 'modules/tmpldata/preProcess.php');
 
                 if (class_exists('preProcess')) {
-                    $pp = new preProcess;
+                    $pp = new preProcess();
                     $this->data['tmpl_data'] = $pp($this->data['tmpl_data'], $this);
                 }
             }

diff --git a/modules/admin/tmpl/loginForm.twig b/modules/admin/tmpl/loginForm.twig
@@ -57,8 +57,7 @@ if (typeof recaptchaCallback !== 'function') {
     if (called) return;
     $('.g-recaptcha').each(function(i, el){
       grecaptcha.render(el, {
-        'sitekey' : $(el).data('sitekey'),
-        {% if lang %} 'hl':'{{ lang }}',{% endif %}
+        {% if lang %}'hl':'{{ lang }}',{% endif %} 
         'callback': function(response) {
           if (response.length > 0){
             $('#login-button').prop('disabled', false);

diff --git a/version b/version
@@ -1,3 +1,4 @@
+5.5.9[] = "Minor code fixes"
 5.5.8[] = "Removed support for bower in userform_ctrl"
 5.5.8[] = "DownloadAndCount::resolvePath is static method"
 5.5.7[] = "Typo fix"