aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-09-21 09:15:26 +0000
committerplegall <plg@piwigo.org>2012-09-21 09:15:26 +0000
commit8c629a7395f160d12e213e198066832d2cebbea4 (patch)
treef85b3196b7ae48ac48fd3a28ddd934abae935b4a /include
parent16eafb642cfcd864f0bea3872a8bfecf837af7d4 (diff)
merge r18116 from branch 2.4 to trunk
bug 2752 fixed: make sure we don't use the mobile theme with the no_photo_yet feature git-svn-id: http://piwigo.org/svn/trunk@18117 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/no_photo_yet.inc.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/no_photo_yet.inc.php b/include/no_photo_yet.inc.php
index db347d9d6..92353dc76 100644
--- a/include/no_photo_yet.inc.php
+++ b/include/no_photo_yet.inc.php
@@ -41,6 +41,10 @@ SELECT
list($nb_photos) = pwg_db_fetch_row(pwg_query($query));
if (0 == $nb_photos)
{
+ // make sure we don't use the mobile theme, which is not compatible with
+ // the "no photo yet" feature
+ $template = new Template(PHPWG_ROOT_PATH.'themes', $user['theme']);
+
if (isset($_GET['no_photo_yet']))
{
if ('browse' == $_GET['no_photo_yet'])