mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-06 23:05:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make docker work with 2.4 branch

Browse Source
This commit is contained in:
jekkos
2016-01-21 16:23:54 +01:00
parent 72fc36c8f5
commit 195c8a0601
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -11,6 +11,7 @@ RUN git clone https://github.com/jekkos/opensourcepos.git /app
# RUN cd app && npm install
RUN ln -fs /app/* /var/www
RUN rm /var/www/index.html
ADD ./start_container.sh /start_container.sh
RUN chmod 755 /start_container.sh
EXPOSE 80 3306

6
system/libraries/Pagination.php
View File

@@ -512,14 +512,16 @@ class CI_Pagination {
{
$this->cur_page = str_replace(array($this->prefix, $this->suffix), '', $this->cur_page);
}
}
} else {
$this->cur_page = (string) $this->cur_page;
}
// If something isn't quite right, back to the default base page.
if ( ! ctype_digit($this->cur_page) OR ($this->use_page_numbers && (int) $this->cur_page === 0))
{
$this->cur_page = $base_page;
}
else
elseif (empty($this->cur_page))
{
// Make sure we're using integers for comparisons later.
$this->cur_page = (int) $this->cur_page;