From decb9a5814be82effde73f798fbdc0c76c3dd1de Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 27 Feb 2014 18:12:43 +0200 Subject: fix of #509, related to php 5.3 --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index deec4226..e13e7e1b 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -366,7 +366,7 @@ class Poche // Saving and clearing context $REAL = array(); foreach( $GLOBALS as $key => $value ) { - if( $key != "GLOBALS" && $key != "_SESSION" ) { + if( $key != 'GLOBALS' && $key != '_SESSION' && $key != 'HTTP_SESSION_VARS' ) { $GLOBALS[$key] = array(); $REAL[$key] = $value; } -- cgit v1.2.3 From 381d182726132b55a24644634b965bb0ccd7830a Mon Sep 17 00:00:00 2001 From: tcitworld Date: Thu, 27 Feb 2014 21:16:16 +0100 Subject: Syntax fix. I think this will be the smallest commit I'll ever make. --- TRANSLATION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TRANSLATION.md b/TRANSLATION.md index 2ea9279e..2e38d5cc 100755 --- a/TRANSLATION.md +++ b/TRANSLATION.md @@ -62,6 +62,6 @@ So, you are almost done. This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi). -##To create new tanslation +##To create new translation Please simple create appropriate directories in locale folder and perform all steps, described above. Instead of opening an existing file just create new one. -- cgit v1.2.3 From 346380e131ac41229fdcadb5bc5dcb99347552ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 27 Feb 2014 21:37:25 +0100 Subject: [add] label for brazilian language on config screen --- inc/poche/Poche.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4100f156..714fa9ee 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -35,6 +35,7 @@ class Poche 'ru_RU.utf8' => 'Pусский', 'sl_SI.utf8' => 'Slovenščina', 'uk_UA.utf8' => 'Українська', + 'pt_BR.utf8' => 'Brasileiro', ); public function __construct() { -- cgit v1.2.3 From 6065553c137ec63ec3ffddda0350f1d3d805b852 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:08:11 +0200 Subject: effect of block rebuilding on next page removed, issue #479 --- inc/poche/Poche.class.php | 1 + themes/baggy/home.twig | 80 +++++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4100f156..d42da60d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -660,6 +660,7 @@ class Poche 'entries' => '', 'page_links' => '', 'nb_results' => '', + 'listmode' => (isset($_COOKIE['listmode']) ? true : false), ); //if id is given - we retrive entries by tag: id is tag id diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 5262c05b..a935b034 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} -- cgit v1.2.3 From fc52df0677cf0477d348a7b71627ea0c2232c2c3 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 28 Feb 2014 13:13:30 +0200 Subject: effect of block rebuilding on next page removed, issue #479 --- themes/baggy/home.twig | 80 +++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index a935b034..7bc0472d 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,45 +12,45 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} - {% if tag %} -

{% trans "Tag" %}: {{ tag.value }}

- {% endif %} - {% if entries is empty %} -

{% trans "No articles found." %}

- {% else %} -
- {% include '_display-mode.twig' %} - {% include '_sorting.twig' %} -
- {% block pager %} - {% if nb_results > 1 %} -
-
{{ nb_results }} {% trans "results" %}
- {{ page_links | raw }} -
- {% endif %} - {% endblock %} -
- {% for entry in entries %} -
-

{{ entry.title|raw }}

- {% if entry.content| getReadingTime > 0 %} -
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
- {% else %} -
{% trans "estimated reading time :" %} < 1 min
- {% endif %} - -

{{ entry.content|striptags|slice(0, 300) }}...

-
+ {% if tag %} +

{% trans "Tag" %}: {{ tag.value }}

+ {% endif %} + {% if entries is empty %} +

{% trans "No articles found." %}

+ {% else %} +
+ {% include '_display-mode.twig' %} + {% include '_sorting.twig' %} +
+ {% block pager %} + {% if nb_results > 1 %} +
+
{{ nb_results }} {% trans "results" %}
+ {{ page_links | raw }} +
+ {% endif %} + {% endblock %} +
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.content| getReadingTime > 0 %} +
{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
+ {% else %} +
{% trans "estimated reading time :" %} < 1 min
+ {% endif %} + +

{{ entry.content|striptags|slice(0, 300) }}...

+
- {% endfor %} -
- {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} - {% endif %} - {{ block('pager') }} + {% endfor %} +
+ {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% endif %} + {{ block('pager') }} {% endblock %} -- cgit v1.2.3 From d4293058364f6f13a7ce55373924b0a563918db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:27:10 +0100 Subject: [fix] #490 flattr icon in baggy theme --- themes/baggy/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 4751c4cb..c925e91c 100644 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -14,7 +14,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} - {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numflattrs }})
    • {% endif %}{% endif %}
  • {% trans "Does this article appear wrong?" %}
    • -- cgit v1.2.3 From 2bb207d005850263ee4cc227d7b4ad147d6291e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 14:54:50 +0100 Subject: [fix] #483 pdo_sqlite not required if we want mysql / pgsql --- check_setup.php | 10 ---------- install/index.php | 31 +++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/check_setup.php b/check_setup.php index 96dd0f7d..2b84a744 100644 --- a/check_setup.php +++ b/check_setup.php @@ -13,16 +13,6 @@ if (version_compare(PHP_VERSION, '5.4.0', '<')) { } } -// Check PDO Sqlite -if (! extension_loaded('pdo_sqlite')) { - die('PHP extension required: pdo_sqlite'); -} - -// Check ZIP -if (! extension_loaded('zip')) { - die('PHP extension required: zip'); -} - // Check if /cache is writeable if (! is_writable('cache')) { die('The directory "cache" must be writeable by your web server user'); diff --git a/install/index.php b/install/index.php index 975b997f..b21cec52 100644 --- a/install/index.php +++ b/install/index.php @@ -225,7 +225,11 @@ php composer.phar install

    Database engine: